Support commonJS and browserify. Cleanup of #572 part 2

pablojim · Mar 26, 2017 · 3612166 · 3612166
1 parent 508df11
commit 3612166
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 5 deletions.
diff --git a/dist/highcharts-ng.js b/dist/highcharts-ng.js
@@ -17,8 +17,7 @@ if (typeof module !== 'undefined' && typeof exports !== 'undefined' && module.ex
 
   if (window && window.Highcharts) {
     Highcharts = window.Highcharts;
-  }
-  if (module && module.exports === 'highcharts-ng') {
+  } else if (module && module.exports === 'highcharts-ng') {
         Highcharts = require('highcharts');
   }
 

diff --git a/dist/highcharts-ng.min.js b/dist/highcharts-ng.min.js
diff --git a/example/charts/app.js b/example/charts/app.js
@@ -90,6 +90,8 @@ myapp.controller('myctrl', function ($scope) {
   $scope.chartConfig = {
 
     chart: {
+      height: 500,
+      width: 500,
       type: 'line'
     },
     plotOptions: {

diff --git a/example/charts/general-example.html b/example/charts/general-example.html
@@ -2,10 +2,12 @@
 <html>
 <head>
     <link href="https://netdna.bootstrapcdn.com/twitter-bootstrap/2.3.2/css/bootstrap-combined.min.css" rel="stylesheet">
+    <link href="../../src/highcharts-ng.css" rel="stylesheet">
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
     <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.8/angular.min.js"></script>
     <script src="https://code.highcharts.com/stock/highstock.src.js"></script>
     <script src="../../src/highcharts-ng.js"></script>
+
     <script src="app.js"></script>
 </head>
 <body>

diff --git a/example/charts/highstocks-app.js b/example/charts/highstocks-app.js
@@ -10,6 +10,8 @@ myapp.controller('myctrl', function ($scope) {
       text: 'Click and drag to zoom in.'
     },
     chart: {
+      height: 500,
+      width: 500,
       backgroundColor: 'transparent',
       zoomType: 'xy',
       resetZoomButton: {

diff --git a/src/highcharts-ng.js b/src/highcharts-ng.js
@@ -9,8 +9,7 @@ if (typeof module !== 'undefined' && typeof exports !== 'undefined' && module.ex
 
   if (window && window.Highcharts) {
     Highcharts = window.Highcharts;
-  }
-  if (module && module.exports === 'highcharts-ng') {
+  } else if (module && module.exports === 'highcharts-ng') {
         Highcharts = require('highcharts');
   }