[email protected]

ax5ui · Sep 8, 2016 · 965a445 · 965a445
1 parent 37e9f14
commit 965a445
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 23 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
 	"name": "ax5ui-modal",
-	"version": "0.7.6",
+	"version": "0.7.7",
 	"authors": [
 		"ThomasJ <[email protected]>"
 	],

diff --git a/dist/ax5modal.js b/dist/ax5modal.js
@@ -8,7 +8,7 @@
 
     UI.addClass({
         className: "modal",
-        version: "0.7.6"
+        version: "0.7.7"
     }, function () {
         /**
          * @class ax5modal
@@ -361,8 +361,10 @@
                     jQuery(window).unbind("resize.ax-modal");
 
                     setTimeout(function () {
-                        this.activeModal.remove();
-                        this.activeModal = null;
+                        if (this.activeModal) {
+                            this.activeModal.remove();
+                            this.activeModal = null;
+                        }
                         onStateChanged.call(this, opts, {
                             self: this,
                             state: "close"
@@ -479,15 +481,11 @@
                     if (fullScreen) {
                         if (opts.header) this.$.header.hide();
                         box.width = jQuery(window).width();
-                        box.height = jQuery(window).height();
+                        box.height = opts.height;
                         box.left = 0;
                         box.top = 0;
-
-                        if (opts.iframe) {
-                            this.$["iframe-wrap"].css({ height: box.height });
-                            this.$["iframe"].css({ height: box.height });
-                        }
                     } else {
+                        if (opts.header) this.$.header.show();
                         if (position) {
                             jQuery.extend(true, opts.position, position);
                         }
@@ -517,9 +515,16 @@
                         } else {
                             box.top = opts.position.top || 0;
                         }
+                        if (box.left < 0) box.left = 0;
+                        if (box.top < 0) box.top = 0;
                     }
 
                     this.activeModal.css(box);
+
+                    if (opts.iframe) {
+                        this.$["iframe-wrap"].css({ height: box.height });
+                        this.$["iframe"].css({ height: box.height });
+                    }
                     return this;
                 };
             }();

diff --git a/dist/ax5modal.min.js b/dist/ax5modal.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "ax5ui-modal",
-	"version": "0.7.6",
+	"version": "0.7.7",
 	"description": "A modal plugin that works with Bootstrap & jQuery",
 	"license": "LGPLv3",
 	"repository": {

diff --git a/src/ax5modal.js b/src/ax5modal.js
@@ -6,7 +6,7 @@
 
     UI.addClass({
         className: "modal",
-        version  : "0.7.6"
+        version  : "0.7.7"
     }, (function () {
         /**
          * @class ax5modal
@@ -414,8 +414,10 @@
                     jQuery(window).unbind("resize.ax-modal");
 
                     setTimeout((function () {
-                        this.activeModal.remove();
-                        this.activeModal = null;
+                        if(this.activeModal) {
+                            this.activeModal.remove();
+                            this.activeModal = null;
+                        }
                         onStateChanged.call(this, opts, {
                             self : this,
                             state: "close"
@@ -532,16 +534,12 @@
                     if (fullScreen) {
                         if (opts.header) this.$.header.hide();
                         box.width = jQuery(window).width();
-                        box.height = jQuery(window).height();
+                        box.height = opts.height;
                         box.left = 0;
                         box.top = 0;
-
-                        if (opts.iframe) {
-                            this.$["iframe-wrap"].css({height: box.height});
-                            this.$["iframe"].css({height: box.height});
-                        }
                     }
                     else {
+                        if (opts.header) this.$.header.show();
                         if (position) {
                             jQuery.extend(true, opts.position, position);
                         }
@@ -577,10 +575,16 @@
                         else {
                             box.top = opts.position.top || 0;
                         }
-
+                        if(box.left < 0) box.left = 0;
+                        if(box.top < 0) box.top = 0;
                     }
 
                     this.activeModal.css(box);
+
+                    if (opts.iframe) {
+                        this.$["iframe-wrap"].css({height: box.height});
+                        this.$["iframe"].css({height: box.height});
+                    }
                     return this;
                 };
             })();

diff --git a/test/index.html b/test/index.html
@@ -17,7 +17,6 @@
 
 <button class="btn btn-danger" id="modal-open">Modal open</button>
 <button class="btn btn-danger" id="modal-close">Modal close</button>
-<button class="btn btn-danger" id="modal-full">Modal opend full</button>
 
 <div style="height: 1000px;"></div>