ng-toaster-rails 0.4.10.1 → 0.4.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 401242d3f02d3e2b48f7fd684785ebe9e4c1fc42
-  data.tar.gz: a76c7190683446075a7bb399de98eabfb4ec1d9f
+  metadata.gz: 3482cecc90762a64a30040b8664ac611d335e083
+  data.tar.gz: 2871be5862d1d17ef6d85bcecd4cdae6f6cdd80b
 SHA512:
-  metadata.gz: 8d9ad77fa42a8867b4b3e6369ffb2f6b72b7b018b8ff70e5aca2d13fff0d4439f50a61b9e3fac2f74c27d46bbe3149bdf2feaaaa2bb51758baa13977c1a346ca
-  data.tar.gz: 2aafe6b0227879f872ac3bcbbe1383267c524b592eee2b532390dadaa5d5660fbb999c71810047b6d6a8735120997f42a9631ad94304ac0711ff3393b86298e9
+  metadata.gz: fa805e539f6152d59f1cb546552007ca5039b0d2c81d35e20bd0cd26fd5575ef858d01a6f5476f20a350abed57aa16a2528c41a90dc9dfe5666aa245383caeb0
+  data.tar.gz: 3b85173a155704ed7b3c1b16d7e2c8caa0b3cb62dad3bbbe9d70a7e06ebd83263b3e86309a53b9c190f467acd16e0f40c5de94c17e940b66404558d95a752ef4

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

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

data/vendor/assets/javascripts/toaster.js

@@ -3,7 +3,7 @@
 
 /*
  * AngularJS Toaster
- * Version: 0.4.10+
+ * Version: 0.4.11
  *
  * Copyright 2013-2014 Jiri Kavulak.
  * All Rights Reserved.
@@ -18,7 +18,17 @@ angular.module('toaster', ['ngAnimate'])
 .constant('toasterConfig', {
     'limit': 0,                   // limits max number of toasts
     'tap-to-dismiss': true,
+
+    /* Options:
+        - Boolean false/true
+            'close-button': true      
+        - object if not a boolean that allows you to 
+          override showing the close button for each
+          icon-class value
+          'close-button': { 'toast-error': true, 'toast-info': false }
+    */
     'close-button': false,
+
     'newest-on-top': true,
     //'fade-in': 1000,            // done in css
     //'on-fade-in': undefined,    // not implemented
@@ -46,7 +56,7 @@ angular.module('toaster', ['ngAnimate'])
     '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, toasterId) {
+    this.pop = function (type, title, body, timeout, bodyOutputType, clickHandler, toasterId, showCloseButton) {
         if (angular.isObject(type)) {
             var params = type; // Enable named parameters as pop argument
             this.toast = {
@@ -55,7 +65,8 @@ angular.module('toaster', ['ngAnimate'])
                 body: params.body,
                 timeout: params.timeout,
                 bodyOutputType: params.bodyOutputType,
-                clickHandler: params.clickHandler
+                clickHandler: params.clickHandler,
+                showCloseButton: params.showCloseButton
             };
             toasterId = params.toasterId;
         } else {
@@ -65,7 +76,8 @@ angular.module('toaster', ['ngAnimate'])
                 body: body,
                 timeout: timeout,
                 bodyOutputType: bodyOutputType,
-                clickHandler: clickHandler
+                clickHandler: clickHandler,
+                showCloseButton: showCloseButton
             };
         }
         $rootScope.$emit('toaster-newToast', toasterId);
@@ -78,9 +90,9 @@ angular.module('toaster', ['ngAnimate'])
     // 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, toasterId) {
+            return function(title, body, timeout, bodyOutputType, clickHandler, toasterId, showCloseButton) {
                 if (angular.isString(title)) {
-                    this.pop(toasterType, title, body, timeout, bodyOutputType, clickHandler, toasterId);
+                    this.pop(toasterType, title, body, timeout, bodyOutputType, clickHandler, toasterId, showCloseButton);
                 } else { // 'title' is actually an object with options
                     this.pop(angular.extend(title, { type: toasterType }));
                 }
@@ -203,6 +215,30 @@ function ($parse, $rootScope, $interval, $sce, toasterConfig, toaster, toasterEv
 
                 toast.id = ++id;
 
+
+                // set the showCloseButton property on the toast so that
+                // each template can bind directly to the property to show/hide
+                // the close button
+                var closeButton = mergedConfig['close-button'];
+
+                // if toast.showCloseButton is a boolean value,
+                // it was specifically overriden in the pop arguments
+                if (typeof toast.showCloseButton === "boolean") {
+                    
+                } else if (typeof closeButton === "boolean") {
+                    toast.showCloseButton = closeButton;
+                } else if (typeof closeButton === "object") {
+                    var closeButtonForType = closeButton[toast.type];
+
+                    if (typeof closeButtonForType !== "undefined" && closeButtonForType !== null) {
+                        toast.showCloseButton = closeButtonForType;
+                    }
+                } else {
+                    // if an option was not set, default to false.
+                    toast.showCloseButton = false;
+                }
+
+
                 // Set the toast.bodyOutputType to the default if it isn't set
                 toast.bodyOutputType = toast.bodyOutputType || mergedConfig['body-output-type'];
                 switch (toast.bodyOutputType) {
@@ -301,14 +337,14 @@ function ($parse, $rootScope, $interval, $sce, toasterConfig, toaster, toasterEv
                 }
             };
 
-            $scope.click = function (toast, isCloseButton) {
-                if ($scope.config.tap === true || isCloseButton === true) {
+            $scope.click = function (toast) {
+                if ($scope.config.tap === true || toast.showCloseButton === true) {
                     var removeToast = true;
                     if (toast.clickHandler) {
                         if (angular.isFunction(toast.clickHandler)) {
-                            removeToast = toast.clickHandler(toast, isCloseButton);
+                            removeToast = toast.clickHandler(toast, toast.showCloseButton);
                         } else if (angular.isFunction($scope.$parent.$eval(toast.clickHandler))) {
-                            removeToast = $scope.$parent.$eval(toast.clickHandler)(toast, isCloseButton);
+                            removeToast = $scope.$parent.$eval(toast.clickHandler)(toast, toast.showCloseButton);
                         } else {
                             console.log("TOAST-NOTE: Your click handler is not inside a parent scope of toaster-container.");
                         }
@@ -322,7 +358,7 @@ function ($parse, $rootScope, $interval, $sce, toasterConfig, toaster, toasterEv
         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>' +
+            '<button type="button" class="toast-close-button" ng-show="toaster.showCloseButton" ng-click="click(toaster)">&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>' +
@@ -334,4 +370,4 @@ function ($parse, $rootScope, $interval, $sce, toasterConfig, toaster, toasterEv
         '</div>'
     };
 }]);
-})(window, document);
+})(window, document);

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ng-toaster-rails
 version: !ruby/object:Gem::Version
-  version: 0.4.10.1
+  version: 0.4.11.0
 platform: ruby
 authors:
 - fdibartolo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-13 00:00:00.000000000 Z
+date: 2015-03-25 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"'