primefaces#3178

Author: tandraschko

src/main/resources/META-INF/resources/primefaces/core/core.utils.js

@@ -34,24 +34,31 @@ if (!PrimeFaces.utils) {
             }
         },
 
-        addDynamicOverlayModal: function(element, id) {
+        addModal: function(id, zIndex) {
             var modalId = id + '_modal';
 
             var modalOverlay = $('<div id="' + modalId + '" class="ui-widget-overlay ui-dialog-mask"></div>');
             modalOverlay.appendTo($(document.body));
-            modalOverlay.css('z-index' , element.css('z-index') - 1);
+            modalOverlay.css('z-index' , zIndex);
 
             return modalOverlay;
         },
 
-        removeDynamicOverlayModal: function(id) {
+        removeModal: function(id) {
             var modalId = id + '_modal';
 
             // if the id contains a ':'
             $(PrimeFaces.escapeClientId(modalId)).remove();
 
             // if the id does NOT contain a ':'
             $(document.body).children("[id='" + modalId + "']").remove();
+        },
+
+        isModalActive: function(id) {
+            var modalId = id + '_modal';
+
+            return $(PrimeFaces.escapeClientId(modalId)).length === 1
+                || $(document.body).children("[id='" + modalId + "']").length === 1;
         }
 
     };

src/main/resources/META-INF/resources/primefaces/core/core.widget.js

@@ -149,7 +149,7 @@ if (!PrimeFaces.widget) {
             if (this.appendTo) {
                 PrimeFaces.utils.removeDynamicOverlay(this, this.jq, this.id, this.appendTo);
             }
-            PrimeFaces.utils.removeDynamicOverlayModal(this.id);
+            PrimeFaces.utils.removeModal(this.id);
 
             this.appendTo = null;
             this.modalOverlay = null;
@@ -162,18 +162,18 @@ if (!PrimeFaces.widget) {
             if (this.appendTo) {
                 PrimeFaces.utils.removeDynamicOverlay(this, this.jq, this.id, this.appendTo);
             }
-            PrimeFaces.utils.removeDynamicOverlayModal(this.id);
+            PrimeFaces.utils.removeModal(this.id);
 
             this.appendTo = null;
             this.modalOverlay = null;
         },
 
         enableModality: function() {
-            this.modalOverlay = PrimeFaces.utils.addDynamicOverlayModal(this.jq, this.id);
+            this.modalOverlay = PrimeFaces.utils.addModal(this.id, this.jq.css('z-index') - 1);
         },
 
         disableModality: function(){
-            PrimeFaces.utils.removeDynamicOverlayModal(this.id);
+            PrimeFaces.utils.removeModal(this.id);
             this.modalOverlay = null;
         }
     });

src/main/resources/META-INF/resources/primefaces/lightbox/lightbox.js

@@ -27,30 +27,31 @@ PrimeFaces.widget.LightBox = PrimeFaces.widget.BaseWidget.extend({
         this.links.data('primefaces-lightbox-trigger', true).find('*').data('primefaces-lightbox-trigger', true);
     },
 
+    //@override
     refresh: function(cfg) {
-        $(PrimeFaces.escapeClientId(cfg.id) + '_panel').remove();
+        PrimeFaces.utils.removeDynamicOverlay(this, this.panel, this.id + '_panel', $(document.body));
 
         this.init(cfg);
     },
 
+    //@override
     destroy: function() {
-        this.panel.remove();
+        PrimeFaces.utils.removeDynamicOverlay(this, this.panel, this.id + '_panel', $(document.body));
     },
 
     createPanel: function() {
-        var dom = '<div id="' + this.id + '_panel" class="ui-lightbox ui-widget ui-helper-hidden ui-corner-all ui-shadow">';
-        dom += '<div class="ui-lightbox-content-wrapper">';
-        dom += '<a class="ui-state-default ui-lightbox-nav-left ui-corner-right ui-helper-hidden"><span class="ui-icon ui-icon-carat-1-w">go</span></a>';
-        dom += '<div class="ui-lightbox-content ui-corner-all"></div>';
-        dom += '<a class="ui-state-default ui-lightbox-nav-right ui-corner-left ui-helper-hidden"><span class="ui-icon ui-icon-carat-1-e">go</span></a>';
-        dom += '</div>';
-        dom += '<div class="ui-lightbox-caption ui-widget-header"><span class="ui-lightbox-caption-text"></span>';
-        dom += '<a class="ui-lightbox-close ui-corner-all" href="#"><span class="ui-icon ui-icon-closethick"></span></a><div style="clear:both" /></div>';
-        dom += '</div>';
-
-        $(document.body).append(dom);
-
-        this.panel = $(this.jqId + '_panel');
+        this.panel = $('<div id="' + this.id + '_panel" class="ui-lightbox ui-widget ui-helper-hidden ui-corner-all ui-shadow">'
+            + '<div class="ui-lightbox-content-wrapper">'
+            + '<a class="ui-state-default ui-lightbox-nav-left ui-corner-right ui-helper-hidden"><span class="ui-icon ui-icon-carat-1-w">go</span></a>'
+            + '<div class="ui-lightbox-content ui-corner-all"></div>'
+            + '<a class="ui-state-default ui-lightbox-nav-right ui-corner-left ui-helper-hidden"><span class="ui-icon ui-icon-carat-1-e">go</span></a>'
+            + '</div>'
+            + '<div class="ui-lightbox-caption ui-widget-header"><span class="ui-lightbox-caption-text"></span>'
+            + '<a class="ui-lightbox-close ui-corner-all" href="#"><span class="ui-icon ui-icon-closethick"></span></a><div style="clear:both" /></div>'
+            + '</div>');
+
+        this.panel.appendTo($(document.body));
+
         this.contentWrapper = this.panel.children('.ui-lightbox-content-wrapper');
         this.content = this.contentWrapper.children('.ui-lightbox-content');
         this.caption = this.panel.children('.ui-lightbox-caption');
@@ -304,7 +305,7 @@ PrimeFaces.widget.LightBox = PrimeFaces.widget.BaseWidget.extend({
 
         this.panel.css('z-index', ++PrimeFaces.zindex).show();
 
-        if(!this.isModalActive()) {
+        if(!PrimeFaces.utils.isModalActive(this.id)) {
             this.enableModality();
         }
 
@@ -340,20 +341,11 @@ PrimeFaces.widget.LightBox = PrimeFaces.widget.BaseWidget.extend({
     },
 
     enableModality: function() {
-        $(document.body).append('<div id="' + this.id + '_modal" class="ui-widget-overlay"></div>').
-            children(this.jqId + '_modal').css({
-                'width': $(document).width()
-                ,'height': $(document).height()
-                ,'z-index': this.panel.css('z-index') - 1
-            });
+        PrimeFaces.utils.addModal(this.id, this.panel.css('z-index') - 1);
     },
 
     disableModality: function() {
-        $(document.body).children(this.jqId + '_modal').remove();
-    },
-
-    isModalActive: function() {
-        return $(document.body).children(this.jqId + '_modal').length === 1;
+        PrimeFaces.utils.removeModal(this.id);
     },
 
     showNavigators: function() {