Changeset 1497

Timestamp:

10.05.2011 20:52:51 (13 months ago)

Author:

zmsdev

Message:

jQuery-1.6: replace attr.offsetHeight/Width by prop.*

Location:

ZMS/trunk

Files:

• dtml/ZMS/manage_editorform.dtml (modified) (1 diff)
• dtml/ZMSObject/input_js.dtml (modified) (1 diff)
• dtml/ZMSWorkflowProvider/manage_main.dtml (modified) (1 diff)
• dtml/object/manage_menu.dtml (modified) (1 diff)
• plugins/www/jquery/jquery-all.min.js (modified) (1 diff)
• www/comlib.js (modified) (1 diff)

ZMS/trunk/dtml/ZMS/manage_editorform.dtml

@@ -140 +140 @@
     }
     if (taMinHeight==null) {
-      taMinHeight = $(ta).attr('offsetHeight') / 2;
+      taMinHeight = $(ta).prop('offsetHeight') / 2;
     }
     var innerDims = getInnerDimensions();
     var bodyDims = getBodyDimensions();
-    var newHeight = Math.max($(ta).attr('offsetHeight')+(innerDims.height-bodyDims.height)-10,taMinHeight);
+    var newHeight = Math.max($(ta).prop('offsetHeight')+(innerDims.height-bodyDims.height)-10,taMinHeight);
     ta.css('height',newHeight);
   }

ZMS/trunk/dtml/ZMSObject/input_js.dtml

@@ -22 +22 @@
     }
     if (taMinHeight==null) {
-      taMinHeight = $(ta).attr('offsetHeight') / 2;
+      taMinHeight = $(ta).prop('offsetHeight') / 2;
     }
     var innerDims = getInnerDimensions();
     var bodyDims = getBodyDimensions();
-    var newHeight = Math.max($(ta).attr('offsetHeight')+(innerDims.height-bodyDims.height)-10,taMinHeight);
+    var newHeight = Math.max($(ta).prop('offsetHeight')+(innerDims.height-bodyDims.height)-10,taMinHeight);
     ta.css('height',newHeight);
   }

ZMS/trunk/dtml/ZMSWorkflowProvider/manage_main.dtml

@@ -114 +114 @@
     }
     if (taMinHeight==null) {
-      taMinHeight = $(ta).attr('offsetHeight') / 2;
+      taMinHeight = $(ta).prop('offsetHeight') / 2;
     }
     var innerDims = getInnerDimensions();
     var bodyDims = getBodyDimensions();
-    var newHeight = Math.max($(ta).attr('offsetHeight')+(innerDims.height-bodyDims.height)-10,taMinHeight);
+    var newHeight = Math.max($(ta).prop('offsetHeight')+(innerDims.height-bodyDims.height)-10,taMinHeight);
     ta.css('height',newHeight);
   }

ZMS/trunk/dtml/object/manage_menu.dtml

@@ -407 +407 @@
         pxinto = 0;
       }
-      var dropimage_offsetHeight = dropimage.attr('offsetHeight');
+      var dropimage_offsetHeight = dropimage.prop('offsetHeight');
       var zmstrashcan = $($("img",element)[1]).attr("src").toLowerCase().indexOf('zmstrashcan')>=0;
       if (!zmstrashcan && posy < element.offsetTop + element.offsetHeight / 2 - pxinto) {

ZMS/trunk/plugins/www/jquery/jquery-all.min.js

@@ -191 +191 @@
 function getCoords(theElement){var coords={x:0,y:0};var element=theElement;while(element){coords.x+=element.offsetLeft;coords.y+=element.offsetTop;element=element.offsetParent}
 return coords}
-function getBodyDimensions(){if(document.body&&document.body.offsetWidth){var div=$('body>div');return {width:div.attr('offsetWidth'),height:div.attr('offsetHeight')}} else {return {width:0,height:0}}}
+function getBodyDimensions(){if(document.body&&document.body.offsetWidth){var div=$('body>div');return {width:div.prop('offsetWidth'),height:div.prop('offsetHeight')}} else {return {width:0,height:0}}}
 function getInnerDimensions(){if(window.innerWidth){return {width:window.innerWidth,height:window.innerHeight}} else if(document.documentElement&&document.documentElement.clientWidth){return {width:document.documentElement.clientWidth,height:document.documentElement.clientHeight}} else if(document.body&&document.body.clientWidth){return {width:document.body.clientWidth,height:document.body.clientHeight}} else {return {width:0,height:0}}}
 function open_frame(title,url,params,width,height,options){href="f_frame";href+="?"+params;href+="&p_url="+url;href+="&p_title="+title;if(height > screen.availHeight||width > screen.availWidth){if(options.indexOf("scrollbars=")< 0){if(height > screen.availHeight)height=screen.availHeight;if(width > screen.availWidth)width=screen.availWidth;options+=",scrollbars=yes"}}

ZMS/trunk/www/comlib.js

@@ -540 +540 @@
   if (document.body && document.body.offsetWidth) {
     var div = $('body>div');
-    return {width: div.attr('offsetWidth'), height: div.attr('offsetHeight')};
+    return {width: div.prop('offsetWidth'), height: div.prop('offsetHeight')};
   } else {
     return {width: 0, height: 0};