Changeset 15762 for trunk/inc

Timestamp:

12/14/11 19:00:44 (5 months ago)

Author:

Alexander Trofimov

Message:

dolPopup - onHide,onBeforeHide events

File:

• trunk/inc/js/jquery.dolPopup.js (modified) (5 diffs)

trunk/inc/js/jquery.dolPopup.js

@@ -19 +19 @@
             onBeforeShow: function () {},
             onShow: function () {},
+            onBeforeHide: function () {},
+            onHide: function () {},
             speed: 150
         };
@@ -70 +72 @@
                 $el._dolPopupSetPosition(o);
 
-                // attach event for "close element"
-                if (o.closeElement) {
-                    $(o.closeElement, $el)
-                        .css('cursor', 'hand')
-                        .click(function() {
-                            $el.dolPopupHide();
-                        });
-                }
-
                 if (!$el.hasClass('bx-popup-applied')) { // do this only once
                     $el.addClass('bx-popup-applied');
@@ -84 +77 @@
                     // save options for element
                     $el.data('bx-popup-options', o);
+
+                    // attach event for "close element"
+                    if (o.closeElement) {
+                        $(o.closeElement, $el)
+                            .css('cursor', 'hand')
+                            .click(function() {
+                                $el.dolPopupHide();
+                            });
+                    }
 
                     // attach event for outer click checking
@@ -115 +117 @@
     };
 
-    $.fn.dolPopupHide = function(options) {
-
-        var defaults = {
-            onHide: function () {}
-        };
-
-        var oHide = $.extend({}, defaults, options);
+    $.fn.dolPopupHide = function(options) { 
+
+        if ('undefined' == typeof(options) || 'object' != typeof(options))
+            options = {};
 
         return this.each(function() {
@@ -129 +128 @@
                 return false;
 
-            var o = $el.data('bx-popup-options');
+            if (!$el.is(':visible') || 'hidden' == $el.css('visibility') || 'none' == $el.css('display'))
+                return false;
+
+            var o = $.extend({}, $el.data('bx-popup-options'), options);
 
             if (!o)
                 return false;
 
-            if (!$el.is(':visible'))
-                return false;
+            o.onBeforeHide();
 
             if (o.speed > 0) {                
                 if (o.fog)
                     $('#bx-popup-fog').fadeOut(o.speed);
-                $el.fadeOut(o.speed, oHide.onHide);
+                $el.fadeOut(o.speed, o.onHide);
             } else {                
                 if (o.fog)
                     $('#bx-popup-fog').hide();
-                $el.hide(oHide.onHide);
+                $el.hide(o.onHide);
             }
         });