[PHP-WEBMASTER] com web/php: flashMessage() now accepts jQuery objects too: js/common.js

[Paul Dragoonis]

Commit:    fd3f5b1881817a2f4cb5933a762d4468a593c8c0
Author:    Dejan Marjanovic <dejan.marjano...@gmail.com>         Mon, 16 Dec 
2013 00:10:12 +0100
Parents:   b00017e929f42017c48ce383370a1f906f4b11d9
Branches:  master

Link:       
http://git.php.net/?p=web/php.git;a=commitdiff;h=fd3f5b1881817a2f4cb5933a762d4468a593c8c0

Log:
flashMessage() now accepts jQuery objects too

Changed paths:
  M  js/common.js


Diff:
diff --git a/js/common.js b/js/common.js
index db08c81..9955047 100755
--- a/js/common.js
+++ b/js/common.js
@@ -308,13 +308,7 @@ $(document).ready(function() {
 /* {{{ Init template generated flash messages */
   $('#flash-message .message').each(function()
   {
-    var alertType = $(this).data('type') || 'success';
-    var timeout = $(this).data('timeout') || 6000;
-       var n = flashMessage({
-               text: $(this).html(),
-               type: alertType,
-      timeout: timeout
-       });
+         flashMessage($(this));
   });
 /* }}} */
 
@@ -380,7 +374,7 @@ $(function() {
 /* }}} */
 
 /* {{{ Flash Messenger */
-function flashMessage(options)
+function flashMessage(o)
 {
   var defaults = { 
     timeout: 6000,
@@ -389,13 +383,29 @@ function flashMessage(options)
     parent: '#flash-message',
   };
   
-  var options = $.extend(defaults, options); 
+  // Options are passed, set defaults and generate message
+  if ( ! o.jquery)
+  {
+    var options = $.extend(defaults, o); 
   
-  var id = 'id_' + Math.random().toString().replace('0.', '');
-  var message = $('<div />').addClass('message ' + options.type).data('type', 
options.type).attr('id', id).html(options.text);
-  $(options.parent).append(message);
+    var id = 'id_' + Math.random().toString().replace('0.', '');
+
+    var message = $('<div />')
+                  .addClass('message ' + options.type)
+                  .data('type', options.type)
+                  .attr('id', id)
+                  .html(options.text);
 
-  var o = $('#' + id);
+    $(options.parent).append(message);
+    
+    var o = $('#' + id);
+  }
+  // jQuery object is passed, that means the message is pre-generated
+  // Only timeout is adjustable via data-timeout=""
+  else
+  {
+    var options = {timeout: o.data('timeout')};
+  }
 
   var remove = function(o) {
     o.slideUp(400, function() {


--
PHP Webmaster List Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php