Changed name of webpack JSONP function and handled null streamURLs.

ToneDen · Dec 4, 2015 · f079020 · f079020
1 parent 7bbfacd
commit f079020
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 6 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -113,7 +113,8 @@ module.exports = function(grunt) {
                 output: {
                     chunkFilename: 'toneden.js',
                     crossOriginLoading: 'anonymous',
-                    filename: 'toneden.loader.js'
+                    filename: 'toneden.loader.js',
+                    jsonpFunction: 'TDSDKjsonp'
                 },
                 module: {
                     loaders: [{
@@ -140,7 +141,8 @@ module.exports = function(grunt) {
                 output: {
                     chunkFilename: 'toneden.js',
                     crossOriginLoading: 'anonymous',
-                    filename: 'toneden.loader.js'
+                    filename: 'toneden.loader.js',
+                    jsonpFunction: 'TDSDKjsonp'
                 },
                 module: {
                     loaders: [{

diff --git a/package.json b/package.json
@@ -16,7 +16,7 @@
   "dependencies": {
     "async": "~1.2.1",
     "d3": "~3.5.5",
-    "fluxxor": "~1.6.0",
+    "fluxxor": "~1.7.3",
     "immutable": "~3.7.4",
     "jquery": "~2.1.4",
     "jsonp": "^0.2.0",
@@ -27,6 +27,6 @@
     "react": "~0.13.3",
     "style-loader": "~0.12.3",
     "superagent": "~1.2.0",
-    "webpack": "~1.9.12"
+    "webpack": "~1.12.9"
   }
 }
diff --git a/sdk/js/index.js b/sdk/js/index.js
@@ -1,6 +1,7 @@
 require('../css');
 
 var _merge = require('lodash/object/merge');
+var BatchingStrategy = require('react/lib/ReactDefaultBatchingStrategy');
 var Fluxxor = require('fluxxor');
 var ReactInjection = require('react/lib/ReactInjection');
 
@@ -29,6 +30,14 @@ var doNotLogEventTypes = [
 if(!flux) {
     flux = new Fluxxor.Flux(require('./flux/stores'), require('./flux/actions'));
 
+    // Custom dispatch wrapper to prevent errors when dispatching actions in componentDidMount method:
+    // https://github.com/BinaryMuse/fluxxor/pull/100
+    flux.setDispatchInterceptor(function(action, dispatch) {
+        BatchingStrategy.batchedUpdates(function() {
+            dispatch(action);
+        });
+    });
+
     // Debug logging.
     flux.on('dispatch', function(type, payload) {
         if(doNotLogEventTypes.indexOf(type) === -1) {

diff --git a/sdk/js/player/AudioInterface.js b/sdk/js/player/AudioInterface.js
@@ -140,9 +140,9 @@ var AudioInterface = function(flux, parameters) {
 
         async.waterfall([
             function(next) {
-                if(streamUrl.search(/soundcloud\.com/i) !== -1) {
+                if(streamUrl && streamUrl.search(/soundcloud\.com/i) !== -1) {
                     return soundcloud.resolve(originalTrack, tracksPerArtist, next);
-                } else if(streamUrl.match(urlRegex)) {
+                } else if(streamUrl && streamUrl.match(urlRegex)) {
                     return next(null, [{
                         stream_url: streamUrl
                     }]);