Changeset 15675 for trunk/inc

Timestamp:

11/15/11 22:06:19 (6 months ago)

Author:

Alexander Trofimov

Message:

Grid - design

Location:

trunk/inc

Files:

• js/classes/BxDolGrid.js (modified) (2 diffs)
• utils.inc.php (modified) (1 diff)

trunk/inc/js/classes/BxDolGrid.js

@@ -81 +81 @@
         items:'tr', 
         forcePlaceholderSize: true, 
+
         start: function(oEvent, oUi) {
-            oUi.placeholder.html('<td colspan="2">&rarr;</td>');
-            oUi.item.addClass('bx-grid-gragging-row');
+
+            jQuery('#' + $this._sIdTable + ' tbody tr').removeClass('bx-def-color-bg-hl bx-grid-table-row-trans'); // remove rows highlighting and transitions  
+
+            oUi.placeholder.html('<td colspan="' + $this._oOptions.columns + '">&rarr;</td>'); // add placeholder with arrow
+        
+            oUi.item.addClass('bx-grid-gragging-row bx-def-color-bg-active'); // apply classes for dragged row            
         },
+
         stop: function(oEvent, oUi) {
-            oUi.item.removeClass('bx-grid-gragging-row');
-            var s = jQuery('#' + $this._sIdTable + ' tbody').sortable('serialize'); // toArray
+            oUi.item.removeClass('bx-grid-gragging-row'); // remove classes from dragged row
+            
+            jQuery('#' + $this._sIdTable + ' tbody tr:odd').addClass('bx-def-color-bg-hl'); // highlight odd rows            
+
+            $this.blink(oUi.item.attr('id')); // make dropped row to blink, so we clearly see where dropped row is places
+
+            // searialize current rows order and send result to the server for saving
+            var s = jQuery('#' + $this._sIdTable + ' tbody').sortable('serialize'); 
             $this.action('reorder', {}, s, true);
         }
     });
+}
+
+BxDolGrid.prototype.blink = function (sId) {
+    var e = jQuery('#' + sId);
+    e.removeClass('bx-grid-table-row-trans');
+    e.addClass('bx-def-color-bg-active');    
+    setTimeout('glGrids.' + this._sObject + '._blinkCallback("' + sId + '")', 200);
+}
+
+BxDolGrid.prototype._blinkCallback = function (sId) {
+    var e = jQuery('#' + sId);
+    e.addClass('bx-grid-table-row-trans');
+    e.removeClass('bx-def-color-bg-active');
 }
 
@@ -234 +259 @@
 
 BxDolGrid.prototype._onDataReloaded = function (isSkipSearchInput) {
+
+    jQuery('#' + this._sIdTable + ' tbody tr:odd').addClass('bx-def-color-bg-hl');
+
     if (this._oOptions.sorting)
         this.orderable();
+
     if (this._oOptions.sortable && 0 == this._sFilter.length && 0 == this._sOrderField.length)
         this.sortable();
+
     this._bindActions(isSkipSearchInput);
 }

trunk/inc/utils.inc.php

@@ -1308 +1308 @@
     $sRet = '';
 
-    if (is_array($a)) {
-
-        if ($sClasses) {
-            $sClasses = trim($sClasses);
-            $a['class'] = $sClasses . (!empty($a['class']) ? ' ' . $a['class'] : '');
-        }
-
-        if ($sStyles) {
-            $sStyles = trim($sStyles);
-            if (';' != $sStyles[strlen($sStyles)-1])
-                $sStyles .= ';';
-            $a['style'] = $sStyles . (!empty($a['style']) ? ' ' . $a['style'] : '');
-        }
-
-        foreach ($a as $sKey => $sValue) {
-
-            if (empty($sValue) || is_null($sValue)) // pass NULL values
-                continue;
-
-            $sValueC = bx_html_attribute($sValue);
-
-            $sRet .= " $sKey=\"$sValueC\"";
-        }
-    }
+    if (!$a || !is_array($a))
+        $a = array();
+
+    if ($sClasses) {
+        $sClasses = trim($sClasses);
+        $a['class'] = $sClasses . (!empty($a['class']) ? ' ' . $a['class'] : '');
+    }
+
+    if ($sStyles) {
+        $sStyles = trim($sStyles);
+        if (';' != $sStyles[strlen($sStyles)-1])
+            $sStyles .= ';';
+        $a['style'] = $sStyles . (!empty($a['style']) ? ' ' . $a['style'] : '');
+    }
+
+    foreach ($a as $sKey => $sValue) {
+
+        if (empty($sValue) || is_null($sValue)) // pass NULL values
+            continue;
+
+        $sValueC = bx_html_attribute($sValue);
+
+        $sRet .= " $sKey=\"$sValueC\"";
+    }
+
 
     return $sRet;