Changeset 91bae44

Timestamp:

12/13/11 15:32:47 (18 months ago)

Author:

yomguy <yomguy@…>

Branches:

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

Children:

d4c2dd3, a50bf1e, b497a41

Parents:

3f143f5

git-author:

yomguy <yomguy@…> (12/13/11 15:32:47)

git-committer:

yomguy <yomguy@…> (12/13/11 15:32:47)

Message:

add cleanup management script

Location:

telemeta

Files:

• htdocs/timeside/js/player.js (modified) (25 diffs)
• htdocs/timeside/js/timeside.js (modified) (12 diffs)
• management/commands/telemeta-cleanup.py (added)

telemeta/htdocs/timeside/js/player.js

@@ -30 +30 @@
 //playerDiv, sound, durationInMsec, visualizers, markerMap);
 Timeside.classes.Player = Timeside.classes.TimesideClass.extend({
-    
+
     //sound duration is in milliseconds because the soundmanager has that unit,
     //player (according to timeside syntax) has durations in seconds
@@ -64 +64 @@
 
         var onReadyWithImage = configObject.onReadyWithImage;
-        
+
         if(typeof onReadyWithImage === 'function'){
             var onReadyWithImageNamespace = 'imgRefreshed.temp_'+new Date().getTime(); //get an unique namespace
@@ -110 +110 @@
                 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{
@@ -160 +160 @@
         this.playState = 0; //0: not playing, 1: loading, 2:buffering, 3 playing (sound heard)
         //container is the div #player
-       
+
         this.getContainer = function(){
             return container;
         };
-        
-        
+
+
 
         var sd = this.toSec(soundDurationInMsec);
@@ -171 +171 @@
             return sd;
         };
-        
+
         this.soundPosition =  sound.position ? this.toSec(sound.position) : 0;
- 
-       
-        
+
+
+
         //
-        
+
         //initializing markermap and markerui
         var map = new Timeside.classes.MarkerMap();
@@ -191 +191 @@
             }
         }
-       
+
         //build the innerHTML as array, then join it. This is usually faster than string concatenation in some browsers.
         //Note that the player image (see below) is not created now, however, if it was, it should be given a src
@@ -221 +221 @@
 
         container.html(html.join(''));
-        
+
         var control = container.find('.ts-control');
 
@@ -421 +421 @@
         var oldSoundPosition = this.soundPosition;
         this.soundPosition = newPositionInSeconds;
-        
+
         //resume playing if it was playing:
         if(wasPlaying){
             var player = this;
-            
+
             //delay a little bit the play resume, this might avoid fast pointer repositioning
             //(it should not be the case, but it happens. why??)
@@ -446 +446 @@
     //markerCrossedOffsetMargin : 0.5,
     play : function(){
-        
+
         if(this.soundErrorMsg){
             alert(this.soundErrorMsg);
@@ -459 +459 @@
             return false;
         }
-        
+
 
         var fireOnMarkerPosition = function(seconds){}; //does nothing by default
@@ -496 +496 @@
                             data.nextMarkerTimeInterval = marker ? [offs-margin, offs+margin] : undefined;
                             player.fire('markerCrossed',data);
-                            
+
                             if(idx<len){
                                 intervalUpperBound =  offs+margin;
@@ -514 +514 @@
         var bufferingString = this.msgs.buffering;
         var loadingString = this.msgs.loading;
-        
+
         var updateWaitBar = this.setWait;
         //building immediately data events to be passed instead of bulding them in the loop whileplaying
@@ -548 +548 @@
             this.fire('playStateChanged',loadData);
         }
-        
+
         var playOptions = {
-            
+
             position: sPosInMsec,
             whileplaying: function(){
@@ -556 +556 @@
                 var sPos = this.position;
                 var buffering = this.isBuffering || typeof sPos != 'number' || sPos < sPosInMsec;
-                
+
                 //var buffering = this.isBuffering; //this refers to the soundmanager sound obj
                 //Now, what are we doing here below? we could simply check whether is buffering or not..
@@ -600 +600 @@
             },
             onfinish: function() {
-                
+
                 //whileplaying is NOT called onsinfish. We must update the pointer:
                 //note that for small length sounds (wg, 5 secs) the pointer shifts abruptly from the last
@@ -680 +680 @@
     setWait: function(msg){
         var wait = undefined;
-      
+
         wait = this.getWaitElement();
         if(!wait || msg === undefined){
@@ -690 +690 @@
 
         var visible = wait.css('display') != 'none';
-        
+
         if(msg && !visible){
             wait.show();
@@ -728 +728 @@
         },100);
     },
-    
+
     resize: function() {
         var height;
         var container = this.getContainer();
-        
+
         var wave = container.find('.ts-wave');
 
@@ -773 +773 @@
         var imageC = container.find('.ts-image-container');
         var image = imageC.find('.ts-image');
-        
+
 
         var size = this.getImageSize();
@@ -785 +785 @@
             return;
         }
-        
+
         var player= this;
-        
+
         if(imageNotYetCreated){
             image = this.$J('<img/>');
@@ -824 +824 @@
         this.fire('imgRefreshing');
         image.attr('src', imgSrc);
-       
+
     },
     getImageSize: function(){
@@ -880 +880 @@
             }
         }
-        
+
         if(idx< len){
             offset = markers[idx].offset;
@@ -1007 +1007 @@
         //        map.clear();
         //        ruler.clear();
-       
+
         var rulerAdd = ruler.add;
-            
+
         if(markers){
             //add markers to the map. No listeners associated to it (for the moment)
@@ -1021 +1021 @@
             });
         }
-        
+
         //the function above calls map.add:
         //add bindings when adding a marker:
@@ -1044 +1044 @@
 
         //and now add a binding to the map when we move a marker:
-          
+
         map.bind('move', function(data){
             var from = data.fromIndex;

telemeta/htdocs/timeside/js/timeside.js

@@ -90 +90 @@
  * (Inspired by base2 and Prototype)
  */
- 
+
 /*
  * In few words: the lightest and most-comprehensive way to implement inhertance and OOP in javascript. Usages can be found below.
@@ -119 +119 @@
  *       }
  *       this.alert = function(){   //another public method, !!!WARNING: this will be put in the MyClass scope (NOT in the prototype)
- *           alert('ok');           
+ *           alert('ok');
  *       }
  *   },
@@ -132 +132 @@
  *  }
  *  alert: function(){                  //override a method
- *      this._super();                  //call the super method, ie alerts 'no'. WARNING: However, as long as there is an alert written 
+ *      this._super();                  //call the super method, ie alerts 'no'. WARNING: However, as long as there is an alert written
  *                                      //in the init method of the superclass (see above), THAT method will be called
  *  }
@@ -210 +210 @@
         // Populate our constructed prototype object
         Class.prototype = prototype;
-        
+
         // Enforce the constructor to be what we expect
         Class.constructor = Class;
@@ -234 +234 @@
         this.listenersMap={};
     },
-    
+
     cssPrefix : 'ts-', //actually almost uneuseful, still here for backward compatibility with old code (TODO: remove?)
     $J : jQuery, //reference to jQuery for faster lookup inside methods
@@ -266 +266 @@
             };
         }
-        
+
         if(listenersMap.hasOwnProperty(eventType)){
             listenersMap[eventType].push(callback);
@@ -343 +343 @@
         }
     },
-    
+
     /*
      *formats (ie returns a string representation of) a time which is in the form seconds,milliseconds (eg 07.6750067)
@@ -364 +364 @@
             formatArray = ['mm','ss'];
         }
-        
+
         //marker offset is in float format second.decimalPart
         var pInt = parseInt;
@@ -376 +376 @@
         var seconds = pInt(time);
         time-=seconds;
-        
+
         //here below the function to format a number
         //ceilAsPowerOfTen is the ceil specifiedas integer indicating the relative power of ten
@@ -476 +476 @@
     //3) each(m,n,callback) iterates over the elements from m (inclusive) to n-1 (inclusive) executing callback
 
-    //NOTE: writing   each : function(startInclusive, endExclusive, callback) throws an error in chrome, as the last 
+    //NOTE: writing   each : function(startInclusive, endExclusive, callback) throws an error in chrome, as the last
     //argument (even if it is a function) is a number. Why?????
     //Anyway, we write the function arguments as empty
@@ -513 +513 @@
             callback(i,me[i]);
         }
-    
+
     },
 
@@ -696 +696 @@
             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();