Fixes #181 usign modal option with custom css theme

needim · Jan 21, 2014 · 49d084b · 49d084b
1 parent 11e9a48
commit 49d084b
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 13 deletions.
diff --git a/demo/themeCss.html b/demo/themeCss.html
@@ -77,6 +77,19 @@
             visibility: visible;
         }
 
+        .noty_modal.someOtherTheme {
+            position: fixed;
+            width: 100%;
+            height: 100%;
+            background-color: #000;
+            z-index: 10000;
+            opacity: 0.6;
+            display: none;
+            border: none;
+            left: 0;
+            top: 0
+        }
+
     </style>
 
 </head>
@@ -103,17 +116,18 @@
             layout      : theme == 'defaultTheme' ? 'topCenter' : 'bottomCenter',
             theme       : theme,
             closeWith   : ['button', 'click'],
-            maxVisible  : 20
+            maxVisible  : 20,
+            modal       : true
         });
         console.log('html: ' + n.options.id);
     }
 
     function generateAll() {
-        generate('alert', 'defaultTheme');
-        generate('information', 'defaultTheme');
-        generate('error', 'defaultTheme');
-        generate('warning', 'defaultTheme');
-        generate('success', 'defaultTheme');
+//        generate('alert', 'defaultTheme');
+//        generate('information', 'defaultTheme');
+//        generate('error', 'defaultTheme');
+//        generate('warning', 'defaultTheme');
+//        generate('success', 'defaultTheme');
 
         generate('alert', 'someOtherTheme');
         generate('information', 'someOtherTheme');

diff --git a/js/noty/jquery.noty.js b/js/noty/jquery.noty.js
@@ -1,5 +1,5 @@
 /**
- * noty - jQuery Notification Plugin v2.2.0
+ * noty - jQuery Notification Plugin v2.2.2
  * Contributors: https://github.com/needim/noty/graphs/contributors
  *
  * Examples and Documentation - http://needim.github.com/noty/
@@ -356,8 +356,14 @@ if (typeof Object.create !== 'function') {
     };
 
     $.notyRenderer.createModalFor = function (notification) {
-        if ($('.noty_modal').length == 0)
-            $('<div/>').addClass('noty_modal').data('noty_modal_count', 0).css(notification.options.theme.modal.css).prependTo($('body')).fadeIn('fast');
+        if ($('.noty_modal').length == 0) {
+			var modal = $('<div/>').addClass('noty_modal').addClass(notification.options.theme).data('noty_modal_count', 0);
+
+			if (notification.options.theme.modal && notification.options.theme.modal.css)
+				modal.css(notification.options.theme.modal.css);
+
+			modal.prependTo($('body')).fadeIn('fast');
+		}
     };
 
     $.notyRenderer.getLayoutCountFor = function (notification) {

diff --git a/js/noty/packaged/jquery.noty.packaged.js b/js/noty/packaged/jquery.noty.packaged.js
@@ -1,5 +1,5 @@
 /**
- * noty - jQuery Notification Plugin v2.2.0
+ * noty - jQuery Notification Plugin v2.2.2
  * Contributors: https://github.com/needim/noty/graphs/contributors
  *
  * Examples and Documentation - http://needim.github.com/noty/
@@ -356,8 +356,14 @@ if (typeof Object.create !== 'function') {
     };
 
     $.notyRenderer.createModalFor = function (notification) {
-        if ($('.noty_modal').length == 0)
-            $('<div/>').addClass('noty_modal').data('noty_modal_count', 0).css(notification.options.theme.modal.css).prependTo($('body')).fadeIn('fast');
+        if ($('.noty_modal').length == 0) {
+			var modal = $('<div/>').addClass('noty_modal').addClass(notification.options.theme).data('noty_modal_count', 0);
+
+			if (notification.options.theme.modal && notification.options.theme.modal.css)
+				modal.css(notification.options.theme.modal.css);
+
+			modal.prependTo($('body')).fadeIn('fast');
+		}
     };
 
     $.notyRenderer.getLayoutCountFor = function (notification) {