fix baseDir

BaiduMusic · May 13, 2015 · 926c395 · 926c395
1 parent b2e4712
commit 926c395
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 38 deletions.
diff --git a/dist/player.js b/dist/player.js
@@ -21,7 +21,6 @@
     namespace: root._mu,
     version: '1.0.0',
     timerResolution: 25,
-    cdn: 'http://apps.bdimg.com/libs/muplayer/',
     engine: {
       TYPES: {
         FLASH_MP3: 'FlashMP3Core',
@@ -2396,7 +2395,7 @@ var slice = [].slice;
     instance = null;
 
     Player.defaults = {
-      baseDir: "" + cfg.cdn + cfg.version,
+      baseDir: 'http://mu5.bdstatic.com/cms/muplayer/1-0-0/',
       mode: 'loop',
       mute: false,
       volume: 80,
@@ -2474,20 +2473,15 @@ var slice = [].slice;
      */
 
     function Player(options) {
-      var baseDir, opts;
+      var baseDir, opts, singleton;
       this.opts = opts = $.extend({}, Player.defaults, options);
       this.waitingTimer = new Timer(100);
       this._checkFrozen(['play', 'pause', 'stop', 'next', 'prev', 'retry', 'replay', 'setVolume', 'setMute', 'setUrl', 'setCurrentPosition', '_startWaitingTimer']);
-      baseDir = opts.baseDir;
-      if (baseDir === false) {
-        baseDir = '';
-      } else if (!baseDir) {
-        throw new Error("baseDir must be set! Usually, it should point to the MuPlayer's dist directory.");
-      }
-      if (baseDir && !baseDir.endsWith('/')) {
+      baseDir = opts.baseDir, singleton = opts.singleton;
+      if (!baseDir.endsWith('/')) {
         baseDir = baseDir + '/';
       }
-      if (opts.singleton) {
+      if (singleton) {
         if (instance) {
           return instance;
         }

diff --git a/dist/player.min.js b/dist/player.min.js
diff --git a/dist/zepto-player.js b/dist/zepto-player.js
@@ -71,7 +71,6 @@
     namespace: root._mu,
     version: '1.0.0',
     timerResolution: 25,
-    cdn: 'http://apps.bdimg.com/libs/muplayer/',
     engine: {
       TYPES: {
         FLASH_MP3: 'FlashMP3Core',
@@ -1818,7 +1817,7 @@ var slice = [].slice;
     instance = null;
 
     Player.defaults = {
-      baseDir: "" + cfg.cdn + cfg.version,
+      baseDir: 'http://mu5.bdstatic.com/cms/muplayer/1-0-0/',
       mode: 'loop',
       mute: false,
       volume: 80,
@@ -1896,20 +1895,15 @@ var slice = [].slice;
      */
 
     function Player(options) {
-      var baseDir, opts;
+      var baseDir, opts, singleton;
       this.opts = opts = $.extend({}, Player.defaults, options);
       this.waitingTimer = new Timer(100);
       this._checkFrozen(['play', 'pause', 'stop', 'next', 'prev', 'retry', 'replay', 'setVolume', 'setMute', 'setUrl', 'setCurrentPosition', '_startWaitingTimer']);
-      baseDir = opts.baseDir;
-      if (baseDir === false) {
-        baseDir = '';
-      } else if (!baseDir) {
-        throw new Error("baseDir must be set! Usually, it should point to the MuPlayer's dist directory.");
-      }
-      if (baseDir && !baseDir.endsWith('/')) {
+      baseDir = opts.baseDir, singleton = opts.singleton;
+      if (!baseDir.endsWith('/')) {
         baseDir = baseDir + '/';
       }
-      if (opts.singleton) {
+      if (singleton) {
         if (instance) {
           return instance;
         }

diff --git a/dist/zepto-player.min.js b/dist/zepto-player.min.js
diff --git a/src/js/core/cfg.coffee b/src/js/core/cfg.coffee
@@ -9,8 +9,6 @@ do (root = @, factory = ->
         # 这个不经测试调优就尽量不要改, 会影响部分统计数据和性能。
         timerResolution: 25
 
-        cdn: 'http://apps.bdimg.com/libs/muplayer/'
-
         engine:
             TYPES:
                 FLASH_MP3: 'FlashMP3Core'

diff --git a/src/js/player.coffee b/src/js/player.coffee
@@ -36,7 +36,7 @@ do (root = this, factory = (
         instance = null
 
         @defaults:
-            baseDir: "#{cfg.cdn}#{cfg.version}"
+            baseDir: 'http://mu5.bdstatic.com/cms/muplayer/1-0-0/'
             mode: 'loop'
             mute: false
             volume: 80
@@ -121,17 +121,13 @@ do (root = this, factory = (
                 'setCurrentPosition', '_startWaitingTimer'
             ])
 
-            baseDir = opts.baseDir
-            if baseDir is false
-                baseDir = ''
-            else unless baseDir
-                throw new Error "baseDir must be set! Usually, it should point to the MuPlayer's dist directory."
-            if baseDir and not baseDir.endsWith('/')
+            { baseDir, singleton } = opts
+
+            unless baseDir.endsWith('/')
                 baseDir = baseDir + '/'
 
-            if opts.singleton
-                if instance
-                    return instance
+            if singleton
+                return instance if instance
                 instance = @
 
             @playlist = new Playlist(absoluteUrl: opts.absoluteUrl)