Merge pull request #75 from John-Henrique/master

Notifications intl
phonon-framework · Jan 31, 2016 · b8580eb · b8580eb
2 parents 02f7964 + 6c26961
commit b8580eb
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 8 deletions.
diff --git a/dist/js/components/list-actions.js b/dist/js/components/list-actions.js
diff --git a/dist/js/components/notifications.js b/dist/js/components/notifications.js
@@ -111,12 +111,13 @@
 		}
 	};
 
-	var buildNotif = function(text, timeout, showButton) {
+	var buildNotif = function(text, timeout, showButton, textButton) {
 		if(typeof text !== 'string') text = '';
 		timeout = (typeof timeout === 'number' ? timeout : 5000);
+		textButton = (typeof textButton === 'string' ? textButton : 'CANCEL');
 
     var progress = '<div class="progress"><div class="determinate"></div></div>';
-    var btn = (showButton === true ? '<button class="btn pull-right" data-hide-notif="true">CANCEL</button>' : '');
+    var btn = (showButton === true ? '<button class="btn pull-right" data-hide-notif="true">'+ textButton +'</button>' : '');
 
     var div = document.createElement('div');
 		div.setAttribute('class', 'notification');
@@ -202,12 +203,12 @@
 		}
 	}
 
-	phonon.notif = function(el, timeout, showButton) {
+	phonon.notif = function(el, timeout, showButton, textButton) {
 
 		if(arguments.length > 1) {
 
 			var text = el;
-			var nBuild = buildNotif(text, timeout, showButton);
+			var nBuild = buildNotif(text, timeout, showButton, textButton);
 			window.setTimeout(function() {
 				show(document.querySelector('#'+nBuild.id));
 			}, 10);

diff --git a/dist/js/phonon.js b/dist/js/phonon.js
@@ -3085,12 +3085,13 @@ phonon.tagManager = (function () {
 		}
 	};
 
-	var buildNotif = function(text, timeout, showButton) {
+	var buildNotif = function(text, timeout, showButton, textButton) {
 		if(typeof text !== 'string') text = '';
 		timeout = (typeof timeout === 'number' ? timeout : 5000);
+		textButton = (typeof textButton === 'string' ? textButton : 'CANCEL');
 
     var progress = '<div class="progress"><div class="determinate"></div></div>';
-    var btn = (showButton === true ? '<button class="btn pull-right" data-hide-notif="true">CANCEL</button>' : '');
+    var btn = (showButton === true ? '<button class="btn pull-right" data-hide-notif="true">'+ textButton +'</button>' : '');
 
     var div = document.createElement('div');
 		div.setAttribute('class', 'notification');
@@ -3176,12 +3177,12 @@ phonon.tagManager = (function () {
 		}
 	}
 
-	phonon.notif = function(el, timeout, showButton) {
+	phonon.notif = function(el, timeout, showButton, textButton) {
 
 		if(arguments.length > 1) {
 
 			var text = el;
-			var nBuild = buildNotif(text, timeout, showButton);
+			var nBuild = buildNotif(text, timeout, showButton, textButton);
 			window.setTimeout(function() {
 				show(document.querySelector('#'+nBuild.id));
 			}, 10);

diff --git a/examples/components/notifications-example/index.html b/examples/components/notifications-example/index.html
@@ -27,6 +27,8 @@ <h1 class="title">Notifications</h1>
             </header>
             <div class="content">
                 <div class="padded-full">
+
+                    <button class="btn btn-flat padded-bottom positive" id="show-notif-button">Show notification custom button</button>
 
                     <button class="btn btn-flat padded-bottom primary" id="show-auto-notif">Show another notification</button>
 
@@ -55,6 +57,10 @@ <h1 class="title">Notifications</h1>
                     document.querySelector('#show-auto-notif').on('tap', function() {
                         phonon.notif('HELLO', 3000, false);
                     });
+
+                    document.querySelector('#show-notif-button').on('tap', function() {
+                        phonon.notif('HELLO AGAIN :-p', 3000, true, 'Close' );
+                    });
 
                     document.querySelector('#show-notif').on('tap', function() {
                         phonon.notif('#notif-example').show();