#171 don't load viz if not in browser.

joola · May 15, 2015 · ba5f1fe · ba5f1fe
1 parent 38550e3
commit ba5f1fe
Show file tree

Hide file tree

Showing 18 changed files with 712 additions and 112,747 deletions.
diff --git a/build/release/joola.js b/build/release/joola.js
diff --git a/build/release/joola.min.css b/build/release/joola.min.css
diff --git a/build/release/joola.min.js b/build/release/joola.min.js
diff --git a/build/release/joola.min.js.map b/build/release/joola.min.js.map
diff --git a/build/temp/joola.js b/build/temp/joola.js
diff --git a/src/lib/index.js b/src/lib/index.js
@@ -59,7 +59,9 @@ joola.emit = function (event, message) {
 };
 joola.api = require('./common/api');
 joola.state = {};
-joola.viz = require('./viz/index');
+
+if (isBrowser())
+  joola.viz = require('./viz/index');
 
 joola.VERSION = require('./../../package.json').version;
 joola._token = null;

diff --git a/src/lib/viz/BarTable.js b/src/lib/viz/BarTable.js
@@ -13,7 +13,7 @@ var
   util = require('util'),
 
   joola = require('../index'),
-  $$ = require('jquery')(require('jsdom').jsdom().parentWindow),
+  $$ = require('jquery'),
   _ = require('underscore');
 
 var BarTable = module.exports = function (options, callback) {

diff --git a/src/lib/viz/Canvas.js b/src/lib/viz/Canvas.js
@@ -14,7 +14,7 @@ var
   util = require('util'),
   _ = require('underscore'),
   ce = require('cloneextend'),
-  $$ = require('jquery')(require('jsdom').jsdom().parentWindow);
+  $$ = require('jquery');
 
 var Canvas = module.exports = function (options, callback) {
   if (!callback)

diff --git a/src/lib/viz/DatePicker.js b/src/lib/viz/DatePicker.js
@@ -13,7 +13,7 @@ var
   util = require('util'),
 
   joola = require('../index'),
-  $$ = require('jquery')(require('jsdom').jsdom().parentWindow),
+  $$ = require('jquery'),
   _ = require('underscore');
 
 var DatePicker = module.exports = function (options, callback) {

diff --git a/src/lib/viz/DimensionPicker.js b/src/lib/viz/DimensionPicker.js
@@ -14,7 +14,7 @@ var
   util = require('util'),
   ce = require('cloneextend'),
   joola = require('../index'),
-  $$ = require('jquery')(require('jsdom').jsdom().parentWindow);
+  $$ = require('jquery');
 
 var DimensionPicker = module.exports = function (options, callback) {
   if (!callback)

diff --git a/src/lib/viz/FilterBox.js b/src/lib/viz/FilterBox.js
@@ -10,7 +10,7 @@
 
 var
   joola = require('../index'),
-  $$ = require('jquery')(require('jsdom').jsdom().parentWindow),
+  $$ = require('jquery'),
   _ = require('underscore');
 
 var FilterBox = module.exports = function (options, callback) {

diff --git a/src/lib/viz/Gauge.js b/src/lib/viz/Gauge.js
@@ -13,7 +13,7 @@ var
   events = require('events'),
   util = require('util'),
   ce = require('cloneextend'),
-  $$ = require('jquery')(require('jsdom').jsdom().parentWindow),
+  $$ = require('jquery'),
   _ = require('underscore');
 
 

diff --git a/src/lib/viz/Metric.js b/src/lib/viz/Metric.js
@@ -13,7 +13,7 @@ var
   util = require('util'),
   ce = require('cloneextend'),
   joola = require('../index'),
-  $$ = require('jquery')(require('jsdom').jsdom().parentWindow),
+  $$ = require('jquery'),
   _ = require('underscore');
 
 var Metric = module.exports = function (options, callback) {

diff --git a/src/lib/viz/MetricPicker.js b/src/lib/viz/MetricPicker.js
@@ -14,7 +14,7 @@ var
   util = require('util'),
   ce = require('cloneextend'),
   joola = require('../index'),
-  $$ = require('jquery')(require('jsdom').jsdom().parentWindow);
+  $$ = require('jquery');
 
 var MetricPicker = module.exports = function (options, callback) {
   if (!callback)

diff --git a/src/lib/viz/Pie.js b/src/lib/viz/Pie.js
@@ -13,7 +13,7 @@ var
   events = require('events'),
   util = require('util'),
   ce = require('cloneextend'),
-  $$ = require('jquery')(require('jsdom').jsdom().parentWindow),
+  $$ = require('jquery'),
   _ = require('underscore');
 
 

diff --git a/src/lib/viz/Table.js b/src/lib/viz/Table.js
@@ -10,7 +10,7 @@
 
 var
   joola = require('../index'),
-  $$ = require('jquery')(require('jsdom').jsdom().parentWindow),
+  $$ = require('jquery'),
   events = require('events'),
   ce = require('cloneextend'),
   util = require('util'),

diff --git a/src/lib/viz/Timeline.js b/src/lib/viz/Timeline.js
@@ -12,7 +12,7 @@ var
   events = require('events'),
   util = require('util'),
   ce = require('cloneextend'),
-  $$ = require('jquery')(require('jsdom').jsdom().parentWindow),
+  $$ = require('jquery'),
   joola = require('../index'),
   moment = require('moment'),
   _ = require('underscore');

diff --git a/src/lib/viz/index.js b/src/lib/viz/index.js
@@ -13,7 +13,7 @@ var
   async = require('async'),
   ce = require('cloneextend'),
   _ = require('underscore'),
-  $$ = require('jquery')(require('jsdom').jsdom().parentWindow);
+  $$ = require('jquery');
 
 var viz = exports;
 viz._id = 'viz';