Changeset 37137fd

Timestamp:

06/25/11 17:40:10 (2 years ago)

Author:

riccardo <riccardo@…>

Branches:

master, crem, crem2, dev, diadems, forma, generic, instru_search, lam, nlivemulti, production, release/1.4.4, security, social, storage, test, video

Children:

fe97d80

Parents:

75617ad

git-author:

riccardo <riccardo@…> (06/25/11 17:40:10)

git-committer:

riccardo <riccardo@…> (06/25/11 17:40:10)

Message:

cleanup and other stuff

Location:

telemeta/htdocs/timeside/js

Files:

• player.js (modified) (5 diffs)
• timeside.js (modified) (3 diffs)

telemeta/htdocs/timeside/js/player.js

@@ -84 +84 @@
         var sound = configObject.sound;
         var createSound = false;
-        if(this.$TU.flahsFailed){
-            this.soundErrorMsg = 'SoundManager error. If your browser does not support HTML5, Flash player (version '+soundManager.flashVersion+'+) must be installed.\nIf flash is installed, try to:\n - Reload the page\n - Empty the cache (see browser preferences/options/tools) and reload the page\n - Restart the browser';
+        if(this.$TU.flashFailed){
+            this.soundErrorMsg = 'soundManager error. If your browser does not support HTML5, Flash player (version '+sMan.flashVersion+'+) must be installed.\nIf flash is installed, try to:\n - Reload the page\n - Empty the cache (see browser preferences/options/tools) and reload the page\n - Restart the browser';
         }else{
             if(typeof sound !== 'string' && typeof sound !== 'object'){
-                this.soundErrorMsg ='bad sound parameter (specify a a valid soundManager sound-object, an object with at least two properties, url and id, or URL as string)';
+                this.soundErrorMsg ='bad sound parameter: specify a a valid soundManager sound-object, an object with at least two properties, url and id, or URL as string';
             }else if(typeof sound === 'string'){
                 createSound = true;
@@ -109 +109 @@
                 var soundOptions = sound;
                 if(sMan.canPlayURL(soundOptions.url)){ //this actually checks only if the url is well formed, not if the file is there
+                    //check if we specified a valid sound duration, otherwise the sound must be loaded
+                    
                     sound = sMan.createSound(soundOptions);
                 }else{
@@ -125 +127 @@
         }
         var soundDurationInMsec = configObject.soundDuration;
-        if(isNaN(soundDurationInMsec) || soundDurationInMsec<=0){
+        if(typeof soundDurationInMsec !== 'number' || soundDurationInMsec<=0){
             onError('invalid soundDurationInMsec: NaN or not positive');
             return;
@@ -376 +378 @@
         //ie, top: auto. This is however useful even if somebody specified a top property on the divs
         ruler_.add(wave).add(control).css('top','auto');
-
-
         onReady(this);
     },
@@ -441 +441 @@
 
     },
-
-    soundErrorMsg: "",
+    showSoundErroMessage: function(){
+        alert(this.soundErrorMsg);
+    },
     //given a marker at index I, specifies that a marker corss event is fired whenever the sound position (pointer)
     //is in the interval ]markerCrossedOffsetMargin-I,I+markerCrossedOffsetMargin[

telemeta/htdocs/timeside/js/timeside.js

@@ -666 +666 @@
 
             };
-
-        }
+        }
+
+        ts.player = undefined;
+        if(config.onReady && typeof config.onReady === 'function'){
+            var oR = config.onReady;
+            config.onReady = function(player){
+                ts.player = player;
+                oR(player);
+            };
+        }else{
+            config.onReady = function(player){
+                ts.player = player;
+            };
+        }
+
         //finally,define the error function
         ts.utils.loadScripts(thisScriptPath,ts_scripts, function() {
-            var p = new ts.classes.Player(config);
-            ts.player = p;
-            return false;
+            new ts.classes.Player(config); //do not assign it to any variable, we do it only onready
         },config.onError);
     };
@@ -680 +691 @@
 
     $J(win).ready(function(){
-
+        var s = soundManager;
         //grab the case of soundManager init errors:
-        soundManager.onerror = function() {
+        s.onerror = function() {
             Timeside.utils.flashFailed = true;
             //end('SoundManager error. If your browser does not support HTML5, Flash player (version '+soundManager.flashVersion+'+) must be installed.\nIf flash is installed, try to:\n - Reload the page\n - Empty the cache (see browser preferences/options/tools) and reload the page\n - Restart the browser');
-
+            
             //and load all anyway:
             loadAll();
@@ -693 +704 @@
         //onready is executed BEFORE onload, it basically queues several onload events.
         //It it is executed immetiately if soundmanager has already been loaded
-        soundManager.onready(loadAll);
+        s.onready(function(){loadAll();});
     });
 };