Commits

Christian Krebs committed c797bd5

fixes for the refactored code

Comments (0)

Files changed (3)

templates/js/js-client-html.mako

   <link rel="stylesheet" href="style.css">
   <script src="${lib_dir}/json.js"></script>
   <script src="${lib_dir}/namespace.js"></script>
-  <script src="${lib_dir}/messages.js"></script>
+  <script src="${lib_dir}/messagemixin.js"></script>
+  <script src="${lib_dir}/messagebroker.js"></script>
   <script src="${lib_dir}/utils.js"></script>
   <script src="${lib_dir}/clientlib_async.js"></script>
   <script src="${lib_dir}/http_interface.js"></script>
   <style> pre { border-bottom: 1px solid #999; padding-bottom: 1em; } </style>
   <script src="${lib_dir}/json.js"></script>
   <script src="${lib_dir}/namespace.js"></script>
-  <script src="${lib_dir}/messages.js"></script>
+  <script src="${lib_dir}/messagemixin.js"></script>
+  <script src="${lib_dir}/messagebroker.js"></script>
   <script src="${lib_dir}/clientlib_async.js"></script>
   <script src="${lib_dir}/http_interface.js"></script>
   <script src="${lib_dir}/stp_0_wrapper.js"></script>
   <title> </title>
   <script src="${lib_dir}/json.js"></script>
   <script src="${lib_dir}/namespace.js"></script>
-  <script src="${lib_dir}/messages.js"></script>
+  <script src="${lib_dir}/messagemixin.js"></script>
+  <script src="${lib_dir}/messagebroker.js"></script>
   <script src="${lib_dir}/clientlib_async.js"></script>
   <script src="${lib_dir}/http_interface.js"></script>
   <script src="${lib_dir}/stp_0_wrapper.js"></script>

templates/js/js-service-base.mako

   }
   arguments.callee.instance = this;
 
-  MessageMixin.apply(this); // mix in message handler behaviour.
+  window.cls.MessageMixin.apply(this); // mix in message handler behaviour.
 
   this.on_enable_success = function(){};
   this.on_window_filter_change = function(filter){};

templates/js/tag_manager.js

    */
   this.set_callback = function(obj, method, args_list)
   {
-    var tag = _get_empty_tag();
+    var tag = this._get_empty_tag();
     this._tags[tag] = [obj,  method, args_list || []];
     return tag;
   };