Changeset 15727 for trunk/inc

Timestamp:

12/06/11 22:25:16 (6 months ago)

Author:

Alexander Trofimov

Message:

Grid - allow to override popup options

File:

• trunk/inc/js/classes/BxDolGrid.js (modified) (2 diffs)

trunk/inc/js/classes/BxDolGrid.js

@@ -15 +15 @@
     this._sOrderDir = undefined == oOptions.order_dir ? 'ASC' : oOptions.order_dir;
     this._sSearchInputText = undefined == oOptions.text_search_input ? '' : oOptions.text_search_input;
-    this._oPopupOptions = {};
+    this._oPopupOptions = oOptions.popup_options;
 
     if (this._sFilter.length)
@@ -235 +235 @@
         var sId = 'grid-popup-' + this._sObject + '-' + sAction;
         $('#' + sId).remove();
-        $('<div id="' + sId + '" style="display: none;"></div>').prependTo('body').html(oData.popup);
-        $('#' + sId).dolPopup(this._oPopupOptions);
+        if ('object' == typeof(oData.popup)) {
+            var o = $.extend(this._oPopupOptions, oData.popup.options)
+            $('<div id="' + sId + '" style="display: none;"></div>').prependTo('body').html(oData.popup.html);
+            $('#' + sId).dolPopup(this._oPopupOptions);
+        } else {
+            $('<div id="' + sId + '" style="display: none;"></div>').prependTo('body').html(oData.popup);
+            $('#' + sId).dolPopup(this._oPopupOptions);
+        }        
     }
 }