X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=manifold%2Fjs%2Fmanifold.js;h=f7c098a4cc22f334ab12e35ff384e244f423aa43;hb=8c344999d6ee3b3a9172a1068a77c83af77a7aee;hp=667ad34bb91e44985fb4f0c92108d01c899bb8d7;hpb=c84873b7b55121705ca5ec4d897194faadcb8408;p=unfold.git

diff --git a/manifold/js/manifold.js b/manifold/js/manifold.js
index 667ad34b..f7c098a4 100644
--- a/manifold/js/manifold.js
+++ b/manifold/js/manifold.js
@@ -370,14 +370,11 @@ var manifold = {
 
     raise_event_handler: function(type, query_uuid, event_type, value)
     {
-        if (type == 'query') {
-            var channels = [ manifold.get_query_channel(query_uuid), manifold.get_query_channel('*') ];
-        } else if (type == 'record') {
-            var channels = [ manifold.get_record_channel(query_uuid), manifold.get_record_channel('*') ];
-
-        } else {
+        if ((type != 'query') && (type != 'record'))
             throw 'Incorrect type for manifold.raise_event()';
-        }
+
+        var channels = [ manifold.get_channel(type, query_uuid), manifold.get_channel(type, '*') ];
+
         $.each(channels, function(i, channel) {
             if (value === undefined)
                 $('.plugin').trigger(channel, [event_type]);
@@ -468,35 +465,18 @@ var manifold = {
     },
 
     /* Publish/subscribe channels for internal use */
-    get_query_channel:  function(uuid) { return '/query/'  + uuid },
-    get_record_channel: function(uuid) { return '/record/' + uuid },
+    get_channel: function(type, query_uuid) 
+    {
+        if ((type !== 'query') && (type != 'record'))
+            return null;
+        return '/' + type + '/' + query_uuid;
+    },
 
 }; // manifold object
 /* ------------------------------------------------------------ */
 
 (function($) {
 
-    /* NEW PLUGIN API
-     * 
-     * NOTE: Since we don't have a plugin class, we are extending all jQuery
-     * plugins...
-     */
-
-    /*!
-     * \brief Associates a query handler to the current plugin
-     * \param uuid (string) query uuid
-     * \param handler (function) handler callback
-     */
-    $.fn.set_query_handler = function(uuid, handler)
-    {
-        this.on(manifold.get_query_channel(uuid), handler);
-    }
-
-    $.fn.set_record_handler = function(uuid, handler)
-    {
-        this.on(manifold.get_record_channel(uuid), handler);
-    }
-
     // OLD PLUGIN API: extend jQuery/$ with pubsub capabilities
     // https://gist.github.com/661855
     var o = $({});