ng-toaster-rails 0.4.10.0 → 0.4.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 697ccecb4ea4a58a6b1831a6b004847a998fa4eb
-  data.tar.gz: 7bc8efe62722bca0d03a3d4d930ed62a5012f1b4
+  metadata.gz: 401242d3f02d3e2b48f7fd684785ebe9e4c1fc42
+  data.tar.gz: a76c7190683446075a7bb399de98eabfb4ec1d9f
 SHA512:
-  metadata.gz: 6c23cb27c01ca38cef99f3bf303120565d83b2a9bc2a1704a4dd4382babbbfb1df1615663f47cb096ece77da00ebafed953c0d1963212f71431fc25875f936e0
-  data.tar.gz: 395425932fe7ed9b4d27bb01a385f8ff0c1eaba6e65a02fecf90b69b1505eab7146be5ee88751ec3122318560cddcb9df8ced640bd3d9f1b4eda7144cadadfc9
+  metadata.gz: 8d9ad77fa42a8867b4b3e6369ffb2f6b72b7b018b8ff70e5aca2d13fff0d4439f50a61b9e3fac2f74c27d46bbe3149bdf2feaaaa2bb51758baa13977c1a346ca
+  data.tar.gz: 2aafe6b0227879f872ac3bcbbe1383267c524b592eee2b532390dadaa5d5660fbb999c71810047b6d6a8735120997f42a9631ad94304ac0711ff3393b86298e9

data/README.md

@@ -1,5 +1,7 @@
 # ng-toaster-rails
 
+[![Gem Version](https://badge.fury.io/rb/ng-toaster-rails.svg)](http://badge.fury.io/rb/ng-toaster-rails)
+
 ng-toaster-rails wraps the [AngularJS-Toaster](https://github.com/jirikavi/AngularJS-Toaster) library in a rails engine for simple use with the asset pipeline provided by Rails 3.1 and higher. The gem includes the development (non-minified) source for ease of exploration. The asset pipeline will minify in production.
 
 For more info on customizing the library, please refer to the [doc](https://github.com/jirikavi/AngularJS-Toaster)

data/lib/ng-toaster-rails/version.rb

@@ -1,6 +1,6 @@
 module NgToaster
   module Rails
     TOASTER_VERSION = "0.4.10"
-    VERSION        = "#{TOASTER_VERSION}.0"
+    VERSION        = "#{TOASTER_VERSION}.1"
   end
 end

data/vendor/assets/javascripts/toaster.js

@@ -3,11 +3,11 @@
 
 /*
  * AngularJS Toaster
- * Version: 0.4.10
+ * Version: 0.4.10+
  *
- * Copyright 2013 Jiri Kavulak.  
- * All Rights Reserved.  
- * Use, reproduction, distribution, and modification of this code is subject to the terms and 
+ * Copyright 2013-2014 Jiri Kavulak.
+ * All Rights Reserved.
+ * Use, reproduction, distribution, and modification of this code is subject to the terms and
  * conditions of the MIT license, available at http://www.opensource.org/licenses/mit-license.php
  *
  * Author: Jiri Kavulak
@@ -16,15 +16,15 @@
 
 angular.module('toaster', ['ngAnimate'])
 .constant('toasterConfig', {
-    'limit': 0,                   // limits max number of toasts 
+    'limit': 0,                   // limits max number of toasts
     'tap-to-dismiss': true,
     'close-button': false,
     'newest-on-top': true,
     //'fade-in': 1000,            // done in css
     //'on-fade-in': undefined,    // not implemented
     //'fade-out': 1000,           // done in css
-    // 'on-fade-out': undefined,  // not implemented
-    //'extended-time-out': 1000,    // not implemented
+    //'on-fade-out': undefined,   // not implemented
+    //'extended-time-out': 1000,  // not implemented
     'time-out': 5000, // Set timeOut and extendedTimeout to 0 to make it sticky
     'icon-classes': {
         error: 'toast-error',
@@ -33,18 +33,22 @@ angular.module('toaster', ['ngAnimate'])
         success: 'toast-success',
         warning: 'toast-warning'
     },
-    'body-output-type': '',// Options: '', 'trustedHtml', 'template', 'templateWithData'
+    'body-output-type': '', // Options: '', 'trustedHtml', 'template', 'templateWithData'
     'body-template': 'toasterBodyTmpl.html',
     'icon-class': 'toast-info',
-    'position-class': 'toast-top-right',
+    'position-class': 'toast-top-right', // Options (see CSS):
+                                         // 'toast-top-full-width', 'toast-bottom-full-width', 'toast-center',
+                                         // 'toast-top-left', 'toast-top-center', 'toast-top-rigt',
+                                         // 'toast-bottom-left', 'toast-bottom-center', 'toast-bottom-rigt',
     'title-class': 'toast-title',
     'message-class': 'toast-message',
+    'prevent-duplicates': false,
     'mouseover-timer-stop': true // stop timeout on mouseover and restart timer on mouseout
 })
 .service('toaster', ['$rootScope', 'toasterConfig', function ($rootScope, toasterConfig) {
-    this.pop = function (type, title, body, timeout, bodyOutputType, clickHandler) {
+    this.pop = function (type, title, body, timeout, bodyOutputType, clickHandler, toasterId) {
         if (angular.isObject(type)) {
-            var params = type; // NOTE: anable parameters as pop argument
+            var params = type; // Enable named parameters as pop argument
             this.toast = {
                 type: params.type,
                 title: params.title,
@@ -53,8 +57,8 @@ angular.module('toaster', ['ngAnimate'])
                 bodyOutputType: params.bodyOutputType,
                 clickHandler: params.clickHandler
             };
-        }
-        else {
+            toasterId = params.toasterId;
+        } else {
             this.toast = {
                 type: type,
                 title: title,
@@ -64,93 +68,124 @@ angular.module('toaster', ['ngAnimate'])
                 clickHandler: clickHandler
             };
         }
-        $rootScope.$emit('toaster-newToast');
+        $rootScope.$emit('toaster-newToast', toasterId);
     };
 
     this.clear = function () {
         $rootScope.$emit('toaster-clearToasts');
     };
-    
+
+    // Create one method per icon class, to allow to call toaster.info() and similar
     for (var type in toasterConfig['icon-classes']) {
-    this[type] = (function (toasterType){ 
-                    return function(title, body, timeout, bodyOutputType, clickHandler) {
-                                if (angular.isString(title))
-                                    this.pop(toasterType, title, body, timeout, bodyOutputType, clickHandler);
-                                else 
-                                    this.pop(angular.extend(title, {type: toasterType}));
-                               }
-                     })(type);
+        this[type] = (function (toasterType) {
+            return function(title, body, timeout, bodyOutputType, clickHandler, toasterId) {
+                if (angular.isString(title)) {
+                    this.pop(toasterType, title, body, timeout, bodyOutputType, clickHandler, toasterId);
+                } else { // 'title' is actually an object with options
+                    this.pop(angular.extend(title, { type: toasterType }));
+                }
+            };
+        })(type);
     }
 }])
-.factory('toasterRegisterEvents', function() {
-  
-  var toasterFactory = {
-      _NewToastEvent: false,
-      _ClearAllToastsEvent: false,
-      registerNewToastEvent: function(){
-        this._NewToastEvent = true;
-      },
-      registerClearAllToastsEvent: function(){
-        this._ClearAllToastsEvent = true;
-      },
-      deregisterNewToastEvent: function(){
-        this._NewToastEvent = false;
-      },
-      deregisterClearAllToastsEvent: function(){
-        this._ClearAllToastsEvent = false;
-      },
-      isRegisteredNewToastEvent: function(){
-        return this._NewToastEvent;
-      },
-      isRegisteredClearAllToastsEvent: function(){
-        return this._ClearAllToastsEvent;
-      }
-    }
+.factory('toasterEventRegistry',['$rootScope', function($rootScope) {
+    var deregisterNewToast = null,
+        deregisterClearToasts = null,
+        newToastEventSubscribers = [],
+        clearToastsEventSubscribers = [],
+        toasterFactory;
+
+    toasterFactory = {
+        setup: function () {
+            if (!deregisterNewToast) {
+                deregisterNewToast = $rootScope.$on('toaster-newToast', function (event, toasterId) {
+                    for (var i = 0, len = newToastEventSubscribers.length; i < len; i++) {
+                        newToastEventSubscribers[i](event, toasterId);
+                    }
+                });
+            }
+
+            if (!deregisterClearToasts) {
+                deregisterClearToasts = $rootScope.$on('toaster-clearToasts', function (event) {
+                    for (var i = 0, len = clearToastsEventSubscribers.length; i < len; i++) {
+                        clearToastsEventSubscribers[i](event);
+                    }
+                });
+            }
+        },
+
+        subscribeToNewToastEvent: function(onNewToast) {
+            newToastEventSubscribers.push(onNewToast);
+        },
+        subscribeToClearToastsEvent: function(onClearToasts) {
+            clearToastsEventSubscribers.push(onClearToasts);
+        },
+        unsubscribeToNewToastEvent: function(onNewToast) {
+            var index = newToastEventSubscribers.indexOf(onNewToast);
+            if (index >= 0)
+                newToastEventSubscribers.splice(index, 1);
+
+            if (newToastEventSubscribers.length === 0) {
+                deregisterNewToast();
+                deregisterNewToast = null;
+            }
+        },
+        unsubscribeToClearToastsEvent: function(onClearToasts) {
+            var index = clearToastsEventSubscribers.indexOf(onClearToasts);
+            if (index >= 0)
+                clearToastsEventSubscribers.splice(index, 1);
+
+            if (clearToastsEventSubscribers.length === 0) {
+                deregisterClearToasts();
+                deregisterClearToasts = null;
+            }
+        }
+    };
     return {
-      registerNewToastEvent: toasterFactory.registerNewToastEvent,
-      registerClearAllToastsEvent: toasterFactory.registerClearAllToastsEvent,
-      deregisterNewToastEvent: toasterFactory.deregisterNewToastEvent,
-      deregisterClearAllToastsEvent: toasterFactory.deregisterClearAllToastsEvent,
-      isRegisteredNewToastEvent: toasterFactory.isRegisteredNewToastEvent,
-      isRegisteredClearAllToastsEvent: toasterFactory.isRegisteredClearAllToastsEvent
-  }
-})
-.directive('toasterContainer', ['$parse', '$rootScope', '$interval', '$sce', 'toasterConfig', 'toaster', 'toasterRegisterEvents',
-function ($parse, $rootScope, $interval, $sce, toasterConfig, toaster, toasterRegisterEvents) {
+        setup: toasterFactory.setup,
+        subscribeToNewToastEvent: toasterFactory.subscribeToNewToastEvent,
+        subscribeToClearToastsEvent: toasterFactory.subscribeToClearToastsEvent,
+        unsubscribeToNewToastEvent: toasterFactory.unsubscribeToNewToastEvent,
+        unsubscribeToClearToastsEvent: toasterFactory.unsubscribeToClearToastsEvent
+    };
+}])
+.directive('toasterContainer', ['$parse', '$rootScope', '$interval', '$sce', 'toasterConfig', 'toaster', 'toasterEventRegistry',
+function ($parse, $rootScope, $interval, $sce, toasterConfig, toaster, toasterEventRegistry) {
     return {
         replace: true,
         restrict: 'EA',
-        scope: true, // creates an internal scope for this directive
+        scope: true, // creates an internal scope for this directive (one per directive instance)
         link: function (scope, elm, attrs) {
             var id = 0,
                 mergedConfig;
 
+            // Merges configuration set in directive with default one
             mergedConfig = angular.extend({}, toasterConfig, scope.$eval(attrs.toasterOptions));
 
             scope.config = {
+                toasterId: mergedConfig['toaster-id'],
                 position: mergedConfig['position-class'],
                 title: mergedConfig['title-class'],
                 message: mergedConfig['message-class'],
                 tap: mergedConfig['tap-to-dismiss'],
                 closeButton: mergedConfig['close-button'],
                 animation: mergedConfig['animation-class'],
-                mouseoverTimer:  mergedConfig['mouseover-timer-stop']
+                mouseoverTimer: mergedConfig['mouseover-timer-stop']
             };
 
-            scope.deregClearToasts = null;
-            scope.deregNewToast = null;
-
-            scope.$on("$destroy",function () {
-                if (scope.deregClearToasts) scope.deregClearToasts();
-                if (scope.deregNewToast) scope.deregNewToast();
-                scope.deregClearToasts=null;
-                scope.deregNewToast=null;
-                toasterRegisterEvents.deregisterNewToastEvent();
-                toasterRegisterEvents.deregisterClearAllToastsEvent();
+            scope.$on("$destroy", function () {
+                toasterEventRegistry.unsubscribeToNewToastEvent(scope._onNewToast);
+                toasterEventRegistry.unsubscribeToClearToastsEvent(scope._onClearToasts);
             });
 
-            scope.configureTimer = function configureTimer(toast) {
-                var timeout = typeof (toast.timeout) == "number" ? toast.timeout : mergedConfig['time-out'];
+            function setTimeout(toast, time) {
+                toast.timeoutPromise = $interval(function () {
+                    scope.removeToast(toast.id);
+                }, time, 1);
+            }
+
+            scope.configureTimer = function (toast) {
+                var timeout = angular.isNumber(toast.timeout) ? toast.timeout : mergedConfig['time-out'];
                 if (timeout > 0)
                     setTimeout(toast, timeout);
             };
@@ -160,8 +195,13 @@ function ($parse, $rootScope, $interval, $sce, toasterConfig, toaster, toasterRe
                 if (!toast.type)
                     toast.type = mergedConfig['icon-class'];
 
-                id++;
-                angular.extend(toast, { id: id });
+                // Prevent adding duplicate toasts if it's set
+                if (mergedConfig['prevent-duplicates'] === true &&
+                    scope.toasters.length > 0 &&
+                    scope.toasters[scope.toasters.length - 1].body === toast.body)
+                    return;
+
+                toast.id = ++id;
 
                 // Set the toast.bodyOutputType to the default if it isn't set
                 toast.bodyOutputType = toast.bodyOutputType || mergedConfig['body-output-type'];
@@ -193,97 +233,104 @@ function ($parse, $rootScope, $interval, $sce, toasterConfig, toaster, toasterRe
                         scope.toasters.shift();
                     }
                 }
-                
-                toast.mouseover = false;
             }
-            
-            function setTimeout(toast, time) {
-                toast.timeout = $interval(function () {
-                    if (!toast.mouseover)
-                        scope.removeToast(toast.id);
-                }, time);
+
+            scope.removeToast = function (id) {
+                var i, len, toast;
+                for (i = 0, len = scope.toasters.length; i < len; i++) {
+                    if (scope.toasters[i].id === id) {
+                        removeToast(i);
+                        break;
+                    }
+                }
+            };
+
+            function removeToast(toastIndex) {
+                var toast = scope.toasters[toastIndex];
+                if (toast) {
+                    if (toast.timeoutPromise) {
+                        $interval.cancel(toast.timeoutPromise);
+                    }
+                    scope.toasters.splice(toastIndex, 1);
+                }
+            }
+
+            function removeAllToasts() {
+                for (var i = scope.toasters.length; i >= 0; i--) {
+                    removeToast(i);
+                }
             }
 
             scope.toasters = [];
-            
-            if(!toasterRegisterEvents.isRegisteredNewToastEvent()){
-                toasterRegisterEvents.registerNewToastEvent();
-                scope.deregNewToast = $rootScope.$on('toaster-newToast', function () {
+
+            scope._onNewToast = function (event, toasterId) {
+                // Compatibility: if toaster has no toasterId defined, and if call to display
+                // hasn't either, then the request is for us
+                if (scope.config.toasterId === undefined && toasterId === undefined ||
+                        // Otherwise, we check if the event is for this toaster
+                        toasterId !== undefined && toasterId === scope.config.toasterId)
                     addToast(toaster.toast);
-              });
-            }
+            };
+            scope._onClearToasts = function (event) {
+                removeAllToasts();
+            };
 
-            if(!toasterRegisterEvents.isRegisteredClearAllToastsEvent()){
-                toasterRegisterEvents.registerClearAllToastsEvent();
-                scope.deregClearToasts = $rootScope.$on('toaster-clearToasts', function () {
-                    scope.toasters.splice(0, scope.toasters.length);
-              });
-            }
+            toasterEventRegistry.setup();
+
+            toasterEventRegistry.subscribeToNewToastEvent(scope._onNewToast);
+            toasterEventRegistry.subscribeToClearToastsEvent(scope._onClearToasts);
         },
         controller: ['$scope', '$element', '$attrs', function ($scope, $element, $attrs) {
-
+            // Called on mouseover
             $scope.stopTimer = function (toast) {
-                toast.mouseover = true;
                 if ($scope.config.mouseoverTimer === true) {
-                    if (toast.timeout) {
-                        $interval.cancel(toast.timeout);
-                        toast.timeout = null;
+                    if (toast.timeoutPromise) {
+                        $interval.cancel(toast.timeoutPromise);
+                        toast.timeoutPromise = null;
                     }
                 }
             };
 
+            // Called on mouseout
             $scope.restartTimer = function (toast) {
-                toast.mouseover = false;
                 if ($scope.config.mouseoverTimer === true) {
-                    if (!toast.timeout)
+                    if (!toast.timeoutPromise)
                         $scope.configureTimer(toast);
-                } 
-                else if (toast.timeout === null) {
-                    $scope.removeToast(toaster.id);
-                } 
-            };
-
-            $scope.removeToast = function (id) {
-                var i = 0;
-                for (i; i < $scope.toasters.length; i++) {
-                    if ($scope.toasters[i].id === id)
-                        break;
+                } else if (toast.timeoutPromise === null) {
+                    $scope.removeToast(toast.id);
                 }
-                $scope.toasters.splice(i, 1);
             };
 
-            $scope.click = function (toaster, isCloseButton) {
-                if ($scope.config.tap === true || isCloseButton == true) {
+            $scope.click = function (toast, isCloseButton) {
+                if ($scope.config.tap === true || isCloseButton === true) {
                     var removeToast = true;
-                    if (toaster.clickHandler) {
-                        if (angular.isFunction(toaster.clickHandler)) {
-                            removeToast = toaster.clickHandler(toaster, isCloseButton);
-                        }
-                        else if (angular.isFunction($scope.$parent.$eval(toaster.clickHandler))) {
-                            removeToast = $scope.$parent.$eval(toaster.clickHandler)(toaster, isCloseButton);
-                        }
-                        else {
+                    if (toast.clickHandler) {
+                        if (angular.isFunction(toast.clickHandler)) {
+                            removeToast = toast.clickHandler(toast, isCloseButton);
+                        } else if (angular.isFunction($scope.$parent.$eval(toast.clickHandler))) {
+                            removeToast = $scope.$parent.$eval(toast.clickHandler)(toast, isCloseButton);
+                        } else {
                             console.log("TOAST-NOTE: Your click handler is not inside a parent scope of toaster-container.");
                         }
                     }
                     if (removeToast) {
-                        $scope.removeToast(toaster.id);
+                        $scope.removeToast(toast.id);
                     }
                 }
             };
         }],
         template:
-        '<div  id="toast-container" ng-class="[config.position, config.animation]">' +
-            '<div ng-repeat="toaster in toasters" class="toast" ng-class="toaster.type" ng-click="click(toaster)" ng-mouseover="stopTimer(toaster)"  ng-mouseout="restartTimer(toaster)">' +
-              '<button class="toast-close-button" ng-show="config.closeButton" ng-click="click(toaster, true)">&times;</button>' +
-              '<div ng-class="config.title">{{toaster.title}}</div>' +
-              '<div ng-class="config.message" ng-switch on="toaster.bodyOutputType">' +
-                '<div ng-switch-when="trustedHtml" ng-bind-html="toaster.html"></div>' +
-                '<div ng-switch-when="template"><div ng-include="toaster.bodyTemplate"></div></div>' +
-                '<div ng-switch-when="templateWithData"><div ng-include="toaster.bodyTemplate"></div></div>' +
-                '<div ng-switch-default >{{toaster.body}}</div>' +
-              '</div>' +
+        '<div id="toast-container" ng-class="[config.position, config.animation]">' +
+          '<div ng-repeat="toaster in toasters" class="toast" ng-class="toaster.type" ng-click="click(toaster)" ng-mouseover="stopTimer(toaster)" ng-mouseout="restartTimer(toaster)">' +
+            '<button class="toast-close-button" ng-show="config.closeButton" ng-click="click(toaster, true)">&times;</button>' +
+            '<div ng-class="config.title">{{toaster.title}}</div>' +
+            '<div ng-class="config.message" ng-switch on="toaster.bodyOutputType">' +
+              '<div ng-switch-when="trustedHtml" ng-bind-html="toaster.html"></div>' +
+              '<div ng-switch-when="template"><div ng-include="toaster.bodyTemplate"></div></div>' +
+              '<div ng-switch-when="templateWithData"><div ng-include="toaster.bodyTemplate"></div></div>' +
+              '<div ng-switch-default >{{toaster.body}}</div>' +
             '</div>' +
+          '</div>' +
         '</div>'
     };
 }]);

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ng-toaster-rails
 version: !ruby/object:Gem::Version
-  version: 0.4.10.0
+  version: 0.4.10.1
 platform: ruby
 authors:
 - fdibartolo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-19 00:00:00.000000000 Z
+date: 2015-03-13 00:00:00.000000000 Z
 dependencies: []
 description: 'Rails engine for jirikavi/AngularJS-Toaster: "AngularJS Toaster is a
   customized version of "toastr" non-blocking notification javascript library"'