fixed pointer bug when user not authenticated (pointer moves regardeless of authentic...

diff --git a/telemeta/htdocs/js/application.js b/telemeta/htdocs/js/application.js
index 295405cd2093a7213e4559313e74ebba5ab5e8af..b7de4bc17326f437fc660114ff703ccd259a49e5 100644 (file)
--- a/telemeta/htdocs/js/application.js
+++ b/telemeta/htdocs/js/application.js
@@ -1299,9 +1299,19 @@ return element && element.length && element instanceof this.$J && element[0] !==
     //p.wdow = p.$J(window);\r
     //methods:\r
 \r
-    //    p.getFormData = function(){\r
-    //        var elms = this.getDiv().find\r
-    //    }\r
+        p.getFormData = function(){\r
+            var elms = this.find('input,select,textarea');\r
+            var ret = {};\r
+            var $J = this.$J;\r
+            elms.each(function(i,e){\r
+                var ee = $J(e);\r
+                var key = ee.attr('name');\r
+                if(key){\r
+                    ret[key] = ee.val();\r
+                }\r
+            });\r
+            return ret;\r
+        }\r
 \r
     p.bind = function(eventName, callback){ //eventname: show, blur or ok\r
         var listeners = this.getListeners();\r

diff --git a/telemeta/htdocs/timeside/src/ruler.js b/telemeta/htdocs/timeside/src/ruler.js
index 34250a5a3f23bad66666ff71782bf415b8c2abf4..8a29fc3ace25974cd268401c1e8e6a3c502fbbb8 100644 (file)
--- a/telemeta/htdocs/timeside/src/ruler.js
+++ b/telemeta/htdocs/timeside/src/ruler.js
@@ -41,57 +41,6 @@ var Ruler = TimesideArray.extend({
         if(!isInteractive){ //is not interactive, skip all methods assignmenets below
             return;
         }
-
-    // TODO: check here
-    // http://stackoverflow.com/questions/3299926/ie-mousemove-bug
-    // div in IE to receive mouse events must have a background
-    // so for the moment
-        
-        
-   
-    //        var mouseDown = false;
-    //        var _onMouseDown = function(evt) {
-    //            mouseDown = true;
-    //            this._onMouseMove(evt);
-    //            evt.preventDefault(); //If this method is called, the default action of the event will not be triggered.
-    //        };
-    //        var _onMouseMove = function(evt) {
-    //            if (mouseDown) {
-    //                var pixelOffset = evt.pageX - container.offset().left;
-    //                this._movePointerAndUpdateSoundPosition(pixelOffset / this.width * this.duration);
-    //            //moves the pointer and fires onPointerMove
-    //            }
-    //            return false;
-    //        };
-    //
-    //        var _onMouseUp= function(evt) {
-    //            if (mouseDown) {
-    //                mouseDown = false;
-    //                this.debug('_onMouseUp:'+this.pointerPos+' '+this.cfg.sound.position);
-    //            }
-    //            return false;
-    //        };
-    //        var imgContainer = viewer.find('.' + cssPref + 'image-container'); // for IE
-    //        var element = waveContainer.add(imgContainer); //constructs a new jQuery object which is the union of the jquery objects
-    //
-    //        element
-    //        .bind('click dragstart', function() {
-    //            return false;
-    //        })
-    //        .bind('mousedown', function(evt){
-    //            return _onMouseDown(evt);
-    //        })
-    //        .bind('mousemove', function(evt){
-    //            return _onMouseMove(evt);
-    //        })
-    //        .bind('mouseup', function(evt){
-    //            return _onMouseUp(evt);
-    //        });
-    //        this.$J(document)
-    //        .bind('mousemove', function(evt){
-    //            return _onMouseMove(evt);
-    //        });
-
     },
 
     resize : function(){
@@ -362,7 +311,7 @@ var Ruler = TimesideArray.extend({
 
         if(typeof markerObjOrOffset == 'number'){
             soundPosition = markerObjOrOffset;
-            isMovable = this.isInteractive();
+            isMovable = true; //this.isInteractive();
             markerClass='pointer';
         }else{
             soundPosition = markerObjOrOffset.offset;
@@ -533,4 +482,55 @@ var Ruler = TimesideArray.extend({
         var soundPosition = (pixelOffset / width) *duration;
         return soundPosition;
     }
-});
\ No newline at end of file
+});
+
+
+    // TODO: check here
+    // http://stackoverflow.com/questions/3299926/ie-mousemove-bug
+    // div in IE to receive mouse events must have a background
+    // so for the moment
+
+
+
+    //        var mouseDown = false;
+    //        var _onMouseDown = function(evt) {
+    //            mouseDown = true;
+    //            this._onMouseMove(evt);
+    //            evt.preventDefault(); //If this method is called, the default action of the event will not be triggered.
+    //        };
+    //        var _onMouseMove = function(evt) {
+    //            if (mouseDown) {
+    //                var pixelOffset = evt.pageX - container.offset().left;
+    //                this._movePointerAndUpdateSoundPosition(pixelOffset / this.width * this.duration);
+    //            //moves the pointer and fires onPointerMove
+    //            }
+    //            return false;
+    //        };
+    //
+    //        var _onMouseUp= function(evt) {
+    //            if (mouseDown) {
+    //                mouseDown = false;
+    //                this.debug('_onMouseUp:'+this.pointerPos+' '+this.cfg.sound.position);
+    //            }
+    //            return false;
+    //        };
+    //        var imgContainer = viewer.find('.' + cssPref + 'image-container'); // for IE
+    //        var element = waveContainer.add(imgContainer); //constructs a new jQuery object which is the union of the jquery objects
+    //
+    //        element
+    //        .bind('click dragstart', function() {
+    //            return false;
+    //        })
+    //        .bind('mousedown', function(evt){
+    //            return _onMouseDown(evt);
+    //        })
+    //        .bind('mousemove', function(evt){
+    //            return _onMouseMove(evt);
+    //        })
+    //        .bind('mouseup', function(evt){
+    //            return _onMouseUp(evt);
+    //        });
+    //        this.$J(document)
+    //        .bind('mousemove', function(evt){
+    //            return _onMouseMove(evt);
+    //        });
\ No newline at end of file