From 63660d176dff8a3e2b5195d34a63948891138c47 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Thu, 11 Apr 2013 12:57:05 +0200 Subject: [PATCH] extract messages sending functions in messages-runtime.js that is not a in plugins as it has wide spectrum --- plugins/messages/messages.js | 15 --------------- unfold/js/messages-runtime.js | 15 +++++++++++++++ views/templates/layout-unfold1.html | 1 + views/templates/layout-unfold2.html | 1 + 4 files changed, 17 insertions(+), 15 deletions(-) create mode 100644 unfold/js/messages-runtime.js diff --git a/plugins/messages/messages.js b/plugins/messages/messages.js index e1871f00..76f1fb39 100644 --- a/plugins/messages/messages.js +++ b/plugins/messages/messages.js @@ -108,21 +108,6 @@ })(jQuery); -// messages runtime -- convenience functions messages.fatal and the like -// in addition, messages can get lost if the UI is not ready to accept them -// so we use console.log in this case -var messages = { - ready : false, - levels : ['fatal','error','warning','info','debug'], - handler : function (level,msg) { - if (messages.ready) $.publish("/messages/"+level+"/",msg); - else console.log("/messages/"+level+"/: "+msg); - }, -}; -for (var i in messages.levels) { var level=messages.levels[i]; messages[level]=function (msg) {messages.handler (level,msg)};} -$(function(){messages.ready=true;}) - - /* turn this on for an auto-test on startup var messages_test = { // set this to 0 to disable diff --git a/unfold/js/messages-runtime.js b/unfold/js/messages-runtime.js new file mode 100644 index 00000000..fa4d552d --- /dev/null +++ b/unfold/js/messages-runtime.js @@ -0,0 +1,15 @@ +// messages runtime -- convenience functions messages.fatal and the like +// in addition, messages can get lost if the UI is not ready to accept them +// so we use console.log in this case +var messages = { + ready : false, + levels : ['fatal','error','warning','info','debug'], + handler : function (level,msg) { + if (messages.ready) $.publish("/messages/"+level+"/",msg); + else console.log("/messages/"+level+"/: "+msg); + }, +}; +for (var i in messages.levels) { var level=messages.levels[i]; messages[level]=function (msg) {messages.handler (level,msg)};} +$(function(){messages.ready=true;}) + + diff --git a/views/templates/layout-unfold1.html b/views/templates/layout-unfold1.html index 1afb575a..24406516 100644 --- a/views/templates/layout-unfold1.html +++ b/views/templates/layout-unfold1.html @@ -10,6 +10,7 @@ {# not yet needed {% insert_str prelude "css/layout-unfold1.css" %} #} {% insert_str prelude "js/jquery.min.js" %} {% insert_str prelude "js/jquery.html5storage.min.js" %} +{% insert_str prelude "js/messages-runtime.js" %} {% insert_str prelude "js/plugin.js" %} {% block container %} diff --git a/views/templates/layout-unfold2.html b/views/templates/layout-unfold2.html index ed7a4881..b107b552 100644 --- a/views/templates/layout-unfold2.html +++ b/views/templates/layout-unfold2.html @@ -10,6 +10,7 @@ {% insert_str prelude "css/layout-unfold2.css" %} {% insert_str prelude "js/jquery.min.js" %} {% insert_str prelude "js/jquery.html5storage.min.js" %} +{% insert_str prelude "js/messages-runtime.js" %} {% insert_str prelude "js/plugin.js" %} {% block container %} -- 2.43.0