fix for #302

needim · Jan 11, 2016 · 6fe2cf8 · 6fe2cf8
1 parent 25f66d6
commit 6fe2cf8
Show file tree

Hide file tree

Showing 19 changed files with 92 additions and 30 deletions.
diff --git a/demo/allLayouts.html b/demo/allLayouts.html
@@ -36,7 +36,7 @@
 <script src="jquery-1.7.2.min.js"></script>
 
 <!-- noty -->
-<script type="text/javascript" src="../js/noty/packaged/jquery.noty.packaged.min.js"></script>
+<script type="text/javascript" src="../js/noty/packaged/jquery.noty.packaged.js"></script>
 
 <script type="text/javascript">
 

diff --git a/demo/api.html b/demo/api.html
@@ -36,7 +36,7 @@
 <script src="jquery-1.7.2.min.js"></script>
 
 <!-- noty -->
-<script type="text/javascript" src="../js/noty/packaged/jquery.noty.packaged.min.js"></script>
+<script type="text/javascript" src="../js/noty/packaged/jquery.noty.packaged.js"></script>
 
 <script type="text/javascript">
 

diff --git a/demo/consumingAlert.html b/demo/consumingAlert.html
@@ -36,7 +36,7 @@
 <script src="jquery-1.7.2.min.js"></script>
 
 <!-- noty -->
-<script type="text/javascript" src="../js/noty/packaged/jquery.noty.packaged.min.js"></script>
+<script type="text/javascript" src="../js/noty/packaged/jquery.noty.packaged.js"></script>
 
 <script type="text/javascript">
 

diff --git a/demo/customContainer.html b/demo/customContainer.html
@@ -42,7 +42,7 @@
 <script src="jquery-1.7.2.min.js"></script>
 
 <!-- noty -->
-<script type="text/javascript" src="../js/noty/packaged/jquery.noty.packaged.min.js"></script>
+<script type="text/javascript" src="../js/noty/packaged/jquery.noty.packaged.js"></script>
 
 <script type="text/javascript">
 

diff --git a/demo/issue302.html b/demo/issue302.html
@@ -0,0 +1,72 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <meta charset="utf-8">
+    <title>issue302</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name="description" content="demonstration of some noty capabilities">
+
+    <link href='http://fonts.googleapis.com/css?family=PT+Sans:regular,italic,bold,bolditalic&amp;subset=latin,latin-ext,cyrillic' rel='stylesheet' type='text/css'>
+    <style type="text/css">
+
+        html {
+            height: 100%;
+            width: 100%;
+        }
+
+        body {
+            font-family: 'PT Sans', Tahoma, Arial, serif;
+            line-height: 13px
+        }
+
+    </style>
+
+    <link rel="stylesheet" type="text/css" href="buttons.css"/>
+    <link rel="stylesheet" type="text/css" href="animate.css"/>
+
+</head>
+<body>
+
+<div class="container">
+
+    <a href="#" class="open">Click here</a>
+
+</div>
+
+<script src="jquery-1.7.2.min.js"></script>
+
+<!-- noty -->
+<script type="text/javascript" src="../js/noty/packaged/jquery.noty.packaged.js"></script>
+
+<script type="text/javascript">
+
+    $(document).ready(function () {
+
+        var options = {
+            text: 'a',
+            timeout: 500,
+            type: 'success',
+            theme: 'relax',
+            layout: 'topRight',
+            closeWith: ['click'],
+            maxVisible: 10,
+            animation: {
+                open: 'animated bounceInDown', // Animate.css class names
+                close: 'animated bounceOutRight', // Animate.css class names
+                easing: 'swing', // unavailable - no need
+                speed: 500 // unavailable - no need
+            }
+        };
+
+        // missing options such as Theme!!
+        $('.open').click(function(e){
+            console.log(options);
+            e.preventDefault();
+            noty(options);
+        });
+    });
+
+</script>
+</body>
+</html>
diff --git a/demo/killer.html b/demo/killer.html
@@ -36,7 +36,7 @@
 <script src="jquery-1.7.2.min.js"></script>
 
 <!-- noty -->
-<script type="text/javascript" src="../js/noty/packaged/jquery.noty.packaged.min.js"></script>
+<script type="text/javascript" src="../js/noty/packaged/jquery.noty.packaged.js"></script>
 
 <script type="text/javascript">
 

diff --git a/demo/themeBootstrap.html b/demo/themeBootstrap.html
@@ -36,7 +36,7 @@
 <script src="jquery-1.7.2.min.js"></script>
 
 <!-- noty -->
-<script type="text/javascript" src="../js/noty/packaged/jquery.noty.packaged.min.js"></script>
+<script type="text/javascript" src="../js/noty/packaged/jquery.noty.packaged.js"></script>
 
 <script type="text/javascript">
 

diff --git a/demo/themeCss.html b/demo/themeCss.html
@@ -104,7 +104,7 @@
 <script src="jquery-1.7.2.min.js"></script>
 
 <!-- noty -->
-<script type="text/javascript" src="../js/noty/packaged/jquery.noty.packaged.min.js"></script>
+<script type="text/javascript" src="../js/noty/packaged/jquery.noty.packaged.js"></script>
 
 <script type="text/javascript">
 

diff --git a/demo/usingMaxVisible.html b/demo/usingMaxVisible.html
@@ -31,7 +31,7 @@ <h3>maxVisible: 3</h3>
 <script src="jquery-1.7.2.min.js"></script>
 
 <!-- noty -->
-<script type="text/javascript" src="../js/noty/packaged/jquery.noty.packaged.min.js"></script>
+<script type="text/javascript" src="../js/noty/packaged/jquery.noty.packaged.js"></script>
 
 <script type="text/javascript">
 

diff --git a/demo/usingWithAnimate.css.html b/demo/usingWithAnimate.css.html
@@ -38,7 +38,7 @@
     <script src="jquery-1.7.2.min.js"></script>
 
     <!-- noty -->
-    <script type="text/javascript" src="../js/noty/packaged/jquery.noty.packaged.min.js"></script>
+    <script type="text/javascript" src="../js/noty/packaged/jquery.noty.packaged.js"></script>
     <script type="text/javascript" src="notification_html.js"></script>
 
     <script type="text/javascript">

diff --git a/demo/usingWithButtons.html b/demo/usingWithButtons.html
@@ -36,7 +36,7 @@
 <script src="jquery-1.7.2.min.js"></script>
 
 <!-- noty -->
-<script type="text/javascript" src="../js/noty/packaged/jquery.noty.packaged.min.js"></script>
+<script type="text/javascript" src="../js/noty/packaged/jquery.noty.packaged.js"></script>
 
 <script type="text/javascript">
 

diff --git a/demo/usingWithButtons2.html b/demo/usingWithButtons2.html
@@ -36,7 +36,7 @@
 <script src="jquery-1.7.2.min.js"></script>
 
 <!-- noty -->
-<script type="text/javascript" src="../js/noty/packaged/jquery.noty.packaged.min.js"></script>
+<script type="text/javascript" src="../js/noty/packaged/jquery.noty.packaged.js"></script>
 
 <script type="text/javascript">
 

diff --git a/demo/usingWithModal.html b/demo/usingWithModal.html
@@ -36,7 +36,7 @@
 <script src="jquery-1.7.2.min.js"></script>
 
 <!-- noty -->
-<script type="text/javascript" src="../js/noty/packaged/jquery.noty.packaged.min.js"></script>
+<script type="text/javascript" src="../js/noty/packaged/jquery.noty.packaged.js"></script>
 
 <script type="text/javascript">
 

diff --git a/demo/usingWithOldOptions.html b/demo/usingWithOldOptions.html
@@ -36,7 +36,7 @@
 <script src="jquery-1.7.2.min.js"></script>
 
 <!-- noty -->
-<script type="text/javascript" src="../js/noty/packaged/jquery.noty.packaged.min.js"></script>
+<script type="text/javascript" src="../js/noty/packaged/jquery.noty.packaged.js"></script>
 
 </body>
 </html>
diff --git a/js/noty/jquery.noty.js b/js/noty/jquery.noty.js
@@ -1,6 +1,6 @@
 /*!
  @package noty - jQuery Notification Plugin
- @version version: 2.3.7
+ @version version: 2.3.8
  @contributors https://github.com/needim/noty/graphs/contributors
 
  @documentation Examples and Documentation - http://needim.github.com/noty/
@@ -30,16 +30,11 @@
             if($.noty.themes[this.options.theme])
                 this.options.theme = $.noty.themes[this.options.theme];
             else
-                options.themeClassName = this.options.theme;
-
-            delete options.layout;
-            delete options.theme;
+                this.options.themeClassName = this.options.theme;
 
             this.options = $.extend({}, this.options, this.options.layout.options);
             this.options.id = 'noty_' + (new Date().getTime() * Math.floor(Math.random() * 1000000));
 
-            this.options = $.extend({}, this.options, options);
-
             // Build the noty dom initial structure
             this._build();
 

diff --git a/js/noty/packaged/jquery.noty.packaged.js b/js/noty/packaged/jquery.noty.packaged.js
@@ -10,7 +10,7 @@
 
 /*!
  @package noty - jQuery Notification Plugin
- @version version: 2.3.7
+ @version version: 2.3.8
  @contributors https://github.com/needim/noty/graphs/contributors
 
  @documentation Examples and Documentation - http://needim.github.com/noty/
@@ -40,16 +40,11 @@
             if($.noty.themes[this.options.theme])
                 this.options.theme = $.noty.themes[this.options.theme];
             else
-                options.themeClassName = this.options.theme;
-
-            delete options.layout;
-            delete options.theme;
+                this.options.themeClassName = this.options.theme;
 
             this.options = $.extend({}, this.options, this.options.layout.options);
             this.options.id = 'noty_' + (new Date().getTime() * Math.floor(Math.random() * 1000000));
 
-            this.options = $.extend({}, this.options, options);
-
             // Build the noty dom initial structure
             this._build();
 

diff --git a/js/noty/packaged/jquery.noty.packaged.min.js b/js/noty/packaged/jquery.noty.packaged.min.js
diff --git a/noty.jquery.json b/noty.jquery.json
@@ -1,6 +1,6 @@
 {
     "name"        : "noty",
-    "version"     : "2.3.7",
+    "version"     : "2.3.8",
     "title"       : "noty - a jquery notification plugin",
     "description" : "noty is a jQuery plugin that makes it easy to create alert - success - error - warning - information - confirmation messages as an alternative the standard alert dialog. Each notification is added to a queue. (Optional)",
     "keywords"    : ["noty", "notification", "plugin", "jquery", "javascript", "alert", "error", "warning", "information", "confirmation"],

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "noty",
-	"version": "2.3.7",
+	"version": "2.3.8",
 	"title": "noty - a jquery notification plugin",
 	"description": "noty is a jQuery plugin that makes it easy to create alert - success - error - warning - information - confirmation messages as an alternative the standard alert dialog. Each notification is added to a queue. (Optional)",
 	"homepage": "http://needim.github.com/noty",