X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=manifold%2Fjs%2Fmanifold.js;h=81c61ce4bc7d9bd45fc1af553ce5c0155fae0dd4;hb=bdc9578767df176902d19e6d94e1aacf6ef921a9;hp=9f24bac353e7395e3b5d4429744731603f4aee3a;hpb=69867d5296684463d3aad4f6db867d24005102aa;p=myslice.git diff --git a/manifold/js/manifold.js b/manifold/js/manifold.js index 9f24bac3..81c61ce4 100644 --- a/manifold/js/manifold.js +++ b/manifold/js/manifold.js @@ -74,8 +74,6 @@ var manifold = { // however in some cases we wish to publish the results under a different uuid // e.g. an updater wants to publish its results as if from the original (get) query asynchroneous_success : function (data, query, publish_uuid, domid) { - if (manifold.asynchroneous_debug) - messages.debug("received manifold result with code " + data.code + " for publish on " + publish_uuid); // xxx should have a nicer declaration of that enum in sync with the python code somehow if (data.code == 1) { alert("Your session has expired, please log in again"); @@ -96,8 +94,9 @@ var manifold = { jQuery('#' + domid).trigger('results', [value]); } else { /* Publish an update announce */ - if (manifold.asynchroneous_debug) messages.debug("publishing results on " + publish_uuid); - jQuery.publish("/results/" + publish_uuid + "/changed", [value, query]); + var channel="/results/" + publish_uuid + "/changed"; + if (manifold.asynchroneous_debug) messages.debug("publishing results on " + channel); + jQuery.publish(channel, [value, query]); } } @@ -112,19 +111,19 @@ var manifold = { var o = $({}); - $.subscribe = function( types, selector, data, fn) { + $.subscribe = function( channel, selector, data, fn) { /* borrowed from jQuery */ if ( data == null && fn == null ) { - // ( types, fn ) + // ( channel, fn ) fn = selector; data = selector = undefined; } else if ( fn == null ) { if ( typeof selector === "string" ) { - // ( types, selector, fn ) + // ( channel, selector, fn ) fn = data; data = undefined; } else { - // ( types, data, fn ) + // ( channel, data, fn ) fn = data; data = selector; selector = undefined; @@ -139,9 +138,9 @@ var manifold = { * supported and editable, we might have the same issue with results but * the page load time will be severely affected... */ - o.on.apply(o, [types, selector, data, function() { + o.on.apply(o, [channel, selector, data, function() { for(i = 1; i < arguments.length; i++) { - if ( arguments[i].constructor.name == 'Query' ) + if ( arguments[i].constructor.name == 'ManifoldQuery' ) arguments[i] = arguments[i].clone(); } fn.apply(o, arguments);