Changeset 795 for ZMS/trunk/import/zms.metaobj.xml

Timestamp:

16.11.2009 16:05:53 (3 years ago)

Author:

cmeier

Message:

zms-2.12.1-02

File:

• ZMS/trunk/import/zms.metaobj.xml (modified) (6 diffs)

ZMS/trunk/import/zms.metaobj.xml

@@ -2777 +2777 @@
 var table_cell_uid = <dtml-var "table_cols*table_rows">;
 var table_cell_id = '';
-var table_cell_bgcolor = '';
+var table_cell_bgcolor = null;
 var table_cell_offs = 2;
 
@@ -2826 +2826 @@
 {
   var dims = getInnerDimensions(true);
-  var coords = getCoords(el);
+  var pos = $(el).position();
   table_cell_id = el.name.substr(el.name.indexOf('_')+1);
   var el_td = $('#content_'+ table_cell_id).parent();
-  table_cell_bgcolor = el_td.css( "backgroundColor");
+  if (table_cell_bgcolor==null) {
+    table_cell_bgcolor = el_td.css( "backgroundColor");
+  }
   el_td.css( "backgroundColor", "red");
   var zmiImgZoomDiv = document.getElementById('zmiImgZoomDiv');
@@ -2844 +2846 @@
   zmiImgZoomImgDiv.style.position = 'absolute';
   zmiImgZoomImgDiv.style.width = '90%';
-  zmiImgZoomImgDiv.style.top = Math.min( coords.y + el.offsetHeight, dims.height - zmiImgZoomImgDiv.offsetHeight); //(dims.height - zmiImgZoomImgDiv.offsetHeight) / 2;
+  zmiImgZoomImgDiv.style.top = Math.min( pos.top + el.offsetHeight, dims.height - zmiImgZoomImgDiv.offsetHeight); //(dims.height - zmiImgZoomImgDiv.offsetHeight) / 2;
   zmiImgZoomImgDiv.style.left = Math.max( ($('body').attr('offsetWidth') - zmiImgZoomImgDiv.offsetWidth) / 2, 0); //(dims.width - zmiImgZoomImgDiv.offsetWidth) / 2;
   // Apply values.
@@ -2880 +2882 @@
   var el_td = $('#content_'+ table_cell_id).parent();
   el_td.css( "backgroundColor", table_cell_bgcolor);
+  table_cell_bgcolor = null;
   var zmiImgZoomDiv = document.getElementById('zmiImgZoomDiv');
   zmiImgZoomDiv.style.visibility = 'hidden';
@@ -3344 +3347 @@
             <item key="name"><![CDATA[ZMSTable]]></item>
             <item key="package"><![CDATA[com.zms.foundation]]></item>
-            <item key="revision"><![CDATA[1.0.0]]></item>
+            <item key="revision"><![CDATA[1.1.0]]></item>
             <item key="type"><![CDATA[ZMSObject]]></item>
           </dictionary>
@@ -4204 +4207 @@
             <item key="name"><![CDATA[com.zms.foundation]]></item>
             <item key="package"/>
-            <item key="revision"><![CDATA[1.0.0]]></item>
+            <item key="revision"><![CDATA[1.1.0]]></item>
             <item key="type"><![CDATA[ZMSPackage]]></item>
           </dictionary>