From 03f3d24114b56f55aba941e7ca5ef39437a9353b Mon Sep 17 00:00:00 2001
From: riccardo <riccardo@parisson.com>
Date: Wed, 22 Jun 2011 13:43:03 +0200
Subject: [PATCH] fixed popup bug and some code missing ";"

---
 telemeta/htdocs/js/playerLoader.js         |  6 +--
 telemeta/htdocs/js/popupdiv.js             | 56 +++++++++-------------
 telemeta/htdocs/timeside/js/player.js      |  6 +--
 telemeta/htdocs/timeside/js/rulermarker.js | 12 ++---
 4 files changed, 35 insertions(+), 45 deletions(-)

diff --git a/telemeta/htdocs/js/playerLoader.js b/telemeta/htdocs/js/playerLoader.js
index 9343a9a9..5c39d49a 100644
--- a/telemeta/htdocs/js/playerLoader.js
+++ b/telemeta/htdocs/js/playerLoader.js
@@ -362,12 +362,12 @@ function loadPlayer(analizerUrl, soundUrl, soundImgSize, itemId, visualizers, cu
                         var confirmExit = function(){
                             var markerUnsaved=0;
                             map.each(function(i,marker){
-                                if(!marker.isSavedOnServer){
+                                if(!marker.isSavedOnServer || marker.isEditable){
                                     markerUnsaved++;
                                 }
                             });
                             if(markerUnsaved>0){
-                                return gettrans('there is at least one unsaved marker') +' ('+ markerUnsaved+ '). '+
+                                return gettrans('there are unsaved or modified markers') +' ('+ markerUnsaved+ '). '+
                                 gettrans('If you exit the page you will loose your changes');
                             }
 
@@ -382,7 +382,7 @@ function loadPlayer(analizerUrl, soundUrl, soundImgSize, itemId, visualizers, cu
                         //a number N means: popup stays maximum N seconds on the screen
                         if(POPUP_TIMEOUT){
                             var popupdiv = new PopupDiv({
-                                focusable: true,
+                                //focusable: false,
                                 titleClass: 'markersdivTitle',
                                 //showClose:true,
 
diff --git a/telemeta/htdocs/js/popupdiv.js b/telemeta/htdocs/js/popupdiv.js
index 4784fa95..fde0afd6 100644
--- a/telemeta/htdocs/js/popupdiv.js
+++ b/telemeta/htdocs/js/popupdiv.js
@@ -1011,17 +1011,18 @@ function PopupDiv() {
             'top':bounds.y+'px'
         });
 
-    //        var topDiv =subdivs.eq(0);
-    //        var centralDiv = subdivs.eq(1);
-    //        var bottomDiv = subdivs.eq(2);
-    //        console.log('presize');
-    //        console.log('width: '+ topDiv.width()+' css-minWidth: ' +topDiv.css('minWidth')+' css-width: ' +topDiv.css('width')+' css-maxWidth: ' +topDiv.css('maxWidth'));
-    //        console.log('width: '+centralDiv.width()+' css-minWidth: ' +centralDiv.css('minWidth')+' css-width: ' +centralDiv.css('width')+' css-maxWidth: ' +centralDiv.css('maxWidth'));
-    //        console.log('width: '+bottomDiv.width()+' css-minWidth: ' +bottomDiv.css('minWidth')+' css-width: ' +bottomDiv.css('width')+' css-maxWidth: ' +bottomDiv.css('maxWidth'));
-    //        console.log(' ' );
+//            var topDiv =subdivs.eq(0);
+//            var centralDiv = subdivs.eq(1);
+//            var bottomDiv = subdivs.eq(2);
+//            console.log('presize');
+//            console.log('width: '+ topDiv.width()+' css-minWidth: ' +topDiv.css('minWidth')+' css-width: ' +topDiv.css('width')+' css-maxWidth: ' +topDiv.css('maxWidth'));
+//            console.log('width: '+centralDiv.width()+' css-minWidth: ' +centralDiv.css('minWidth')+' css-width: ' +centralDiv.css('width')+' css-maxWidth: ' +centralDiv.css('maxWidth'));
+//            console.log('width: '+bottomDiv.width()+' css-minWidth: ' +bottomDiv.css('minWidth')+' css-width: ' +bottomDiv.css('width')+' css-maxWidth: ' +bottomDiv.css('maxWidth'));
+//            console.log(' ' );
     };
     
     p.postSizeFcn = function(){
+        
         //set title and close button to span whole width, if necessary
         //closeButton.outerWidth should be zero if this.showClose = false
         //titleInput.outerWidth(true) should be equal to titleInput.width(), as margins borders and padding are zero, however we want to calculate it safely
@@ -1041,28 +1042,19 @@ function PopupDiv() {
         var maxWidth = div.width();
         var width = centralDiv.outerWidth(true);
             
-        if(maxHeight<=0 || maxWidth<=0){
-            //centralDiv.hide();
-            return;
-        }
         
-        //        if(maxHeight<height){
-        //            centralDiv.css('maxHeight',maxHeight+'px');
-        //        }
+        
+        
 
         //setting centralDiv maxHeight is buggy and not the same behaviour in all browsers
         //so we set a height, which will be reset in preSizeFcn
-        centralDiv.css('height',maxHeight+'px');
+        if(maxHeight>0){
+            centralDiv.css('height',maxHeight+'px');
+        }
         //same for width
-        centralDiv.css('width',maxWidth+'px');
+        //centralDiv.css('width',maxWidth+'px');
 
-        //TODO: check padding margins border or set them to zero in preSizeFcn!!!!!!
-
-
-        //        centralDiv.css('width',maxWidth+'px');
-        //        if(maxWidth<width){
-        //            centralDiv.css('maxWidth',maxWidth+'px');
-        //        }
+        
 
         //to be put AT THE END otherwise bug in IE7
         centralDiv.css('overflow','auto');
@@ -1074,16 +1066,14 @@ function PopupDiv() {
         //centralDiv.css('height',maxHeight);
         //}
 
-        //last thing: the subelements width property seems to be handles in different ways across browsers:
-        //in preSizeFcn, we set a width to auto. Curiously, when resizing the parent div (this.getDiv()), subelements are assigned
-        //a specified width property
-        //IE does what it is expected (werird enogh...), ie sets a maxWidth and
+        
+
+//                console.log('postsize');
+//                console.log('width: '+ topDiv.width()+' css-minWidth: ' +topDiv.css('minWidth')+' css-width: ' +topDiv.css('width')+' css-maxWidth: ' +topDiv.css('maxWidth'));
+//                console.log('width: '+centralDiv.width()+' css-minWidth: ' +centralDiv.css('minWidth')+' css-width: ' +centralDiv.css('width')+' css-maxWidth: ' +centralDiv.css('maxWidth'));
+//                console.log('width: '+bottomDiv.width()+' css-minWidth: ' +bottomDiv.css('minWidth')+' css-width: ' +bottomDiv.css('width')+' css-maxWidth: ' +bottomDiv.css('maxWidth'));
+//                console.log(' ' );
 
-        //        console.log('postsize');
-        //        console.log('width: '+ topDiv.width()+' css-minWidth: ' +topDiv.css('minWidth')+' css-width: ' +topDiv.css('width')+' css-maxWidth: ' +topDiv.css('maxWidth'));
-        //        console.log('width: '+centralDiv.width()+' css-minWidth: ' +centralDiv.css('minWidth')+' css-width: ' +centralDiv.css('width')+' css-maxWidth: ' +centralDiv.css('maxWidth'));
-        //        console.log('width: '+bottomDiv.width()+' css-minWidth: ' +bottomDiv.css('minWidth')+' css-width: ' +bottomDiv.css('width')+' css-maxWidth: ' +bottomDiv.css('maxWidth'));
-        //        console.log(' ' );
         if(this.isClickElement(this.invoker)){
             this.placeAsPopup();
         }else{
diff --git a/telemeta/htdocs/timeside/js/player.js b/telemeta/htdocs/timeside/js/player.js
index 763f538d..45131f9f 100644
--- a/telemeta/htdocs/timeside/js/player.js
+++ b/telemeta/htdocs/timeside/js/player.js
@@ -92,7 +92,7 @@ Timeside.classes.Player = Timeside.classes.TimesideClass.extend({
         var map = new Timeside.classes.MarkerMap();
         this.getMarkerMap = function(){
             return map;
-        }
+        };
 
         var canAddMarkers = false;
         if(newMarkerCallback){
@@ -262,7 +262,7 @@ Timeside.classes.Player = Timeside.classes.TimesideClass.extend({
         //var ruler = new Timeside.classes.Ruler(viewer, this.getSoundDuration());
         this.getRuler = function(){
             return ruler;
-        }
+        };
         //bind mouse events:
         ruler.bind('rulermarkermouseevent', function(data){
            var idx = data.index;
@@ -632,7 +632,7 @@ Timeside.classes.Player = Timeside.classes.TimesideClass.extend({
             var style = {
                 width: wave.width(),
                 height: height
-            }
+            };
             elements.css(style);
             elements.css('position','absolute');
 
diff --git a/telemeta/htdocs/timeside/js/rulermarker.js b/telemeta/htdocs/timeside/js/rulermarker.js
index fc1825f3..ae0cd88e 100644
--- a/telemeta/htdocs/timeside/js/rulermarker.js
+++ b/telemeta/htdocs/timeside/js/rulermarker.js
@@ -69,21 +69,21 @@ Timeside.classes.RulerMarker = Timeside.classes.TimesideClass.extend({
         };
         this.getIndex = function(){
             return index;
-        }
+        };
 
         //end=======================================================
         //creating public methods:
         this.getLabel = function(){
             return label;
-        }
+        };
 
 
         this.getRulerWidth = function(){
             return rulerDiv.width();
-        }
+        };
         this.getWaveHeight = function(){
             return waveImgDiv.height();
-        }
+        };
 
         this.positionInPixels = 0;
         this.positionAsViewerRatio = 0;
@@ -99,7 +99,7 @@ Timeside.classes.RulerMarker = Timeside.classes.TimesideClass.extend({
             path.setAttributeNS(null,'class',canvasClass);
             this.moveCanvas = function(pixelOffset){
                 canvas.setAttributeNS( null, "transform", "translate("+pixelOffset+",0)");
-            }
+            };
             this.jQueryCanvas = $J(canvas);
         }else{
             canvas = this.createCanvasVml(waveImgDiv, arrowBaselineWidth);
@@ -109,7 +109,7 @@ Timeside.classes.RulerMarker = Timeside.classes.TimesideClass.extend({
             this.moveCanvas = function(pixelOffset){
                 //for some reason, coordinates inside the VML object are stored by raphael with a zoom of 10:
                 this.jQueryCanvas.css('left',(10*pixelOffset)+'px');
-            }
+            };
             //apparently, when resizing the markers loose their attributes. Therefore:
             var r = this.refreshPosition; //reference to current refreshPosition
             this.refreshPosition = function(){
-- 
2.39.5