Skip to content

erp5
erp5
Commit 2f7b81cc authored by Romain Courteaud's avatar Romain Courteaud Committed by Sebastien Robin
Browse files
Options

Update renderJS. 

Use a development version based on renderJS 0.7.2.
Stop using development RSVP.
parent 6eb60403
Show whitespace changes
Inline Side-by-side
Showing with 277 additions and 427 deletions
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_RSVP_js.xml
View file @ 2f7b81cc
...@@ -771,11 +771,6 @@ define("rsvp/promise",\n ...@@ -771,11 +771,6 @@ define("rsvp/promise",\n
then = value.then;\n then = value.then;\n
\n \n
if (isFunction(then)) {\n if (isFunction(then)) {\n
if (isFunction(value.on)) {\n
value.on(\'promise:notified\', function (event) {\n
notify(promise, event.detail);\n
});\n
}\n
promise.on(\'promise:cancelled\', function(event) {\n promise.on(\'promise:cancelled\', function(event) {\n
if (isFunction(value.cancel)) {\n if (isFunction(value.cancel)) {\n
value.cancel();\n value.cancel();\n
...@@ -861,7 +856,6 @@ define("rsvp/queue",\n ...@@ -861,7 +856,6 @@ define("rsvp/queue",\n
promise,\n promise,\n
fulfill,\n fulfill,\n
reject,\n reject,\n
notify,\n
resolved;\n resolved;\n
\n \n
if (!(this instanceof Queue)) {\n if (!(this instanceof Queue)) {\n
...@@ -874,7 +868,7 @@ define("rsvp/queue",\n ...@@ -874,7 +868,7 @@ define("rsvp/queue",\n
}\n }\n
}\n }\n
\n \n
promise = new Promise(function(done, fail, progress) {\n promise = new Promise(function(done, fail) {\n
fulfill = function (fulfillmentValue) {\n fulfill = function (fulfillmentValue) {\n
if (resolved) {return;}\n if (resolved) {return;}\n
queue.isFulfilled = true;\n queue.isFulfilled = true;\n
...@@ -889,7 +883,6 @@ define("rsvp/queue",\n ...@@ -889,7 +883,6 @@ define("rsvp/queue",\n
resolved = true;\n resolved = true;\n
return fail(rejectedReason);\n return fail(rejectedReason);\n
};\n };\n
notify = progress;\n
}, canceller);\n }, canceller);\n
\n \n
promise_list.push(delay());\n promise_list.push(delay());\n
...@@ -913,7 +906,7 @@ define("rsvp/queue",\n ...@@ -913,7 +906,7 @@ define("rsvp/queue",\n
return promise.then.apply(promise, arguments);\n return promise.then.apply(promise, arguments);\n
};\n };\n
\n \n
queue.push = function(done, fail, progress) {\n queue.push = function(done, fail) {\n
var last_promise = promise_list[promise_list.length - 1],\n var last_promise = promise_list[promise_list.length - 1],\n
next_promise;\n next_promise;\n
\n \n
...@@ -921,11 +914,11 @@ define("rsvp/queue",\n ...@@ -921,11 +914,11 @@ define("rsvp/queue",\n
throw new ResolvedQueueError();\n throw new ResolvedQueueError();\n
}\n }\n
\n \n
next_promise = last_promise.then(done, fail, progress);\n next_promise = last_promise.then(done, fail);\n
promise_list.push(next_promise);\n promise_list.push(next_promise);\n
\n \n
// Handle pop\n // Handle pop\n
last_promise = next_promise.then(function (fulfillmentValue) {\n promise_list.push(next_promise.then(function (fulfillmentValue) {\n
promise_list.splice(0, 2);\n promise_list.splice(0, 2);\n
if (promise_list.length === 0) {\n if (promise_list.length === 0) {\n
fulfill(fulfillmentValue);\n fulfill(fulfillmentValue);\n
...@@ -939,13 +932,7 @@ define("rsvp/queue",\n ...@@ -939,13 +932,7 @@ define("rsvp/queue",\n
} else {\n } else {\n
throw rejectedReason;\n throw rejectedReason;\n
}\n }\n
}, function (notificationValue) {\n }));\n
if (promise_list[promise_list.length - 1] === last_promise) {\n
notify(notificationValue);\n
}\n
return notificationValue;\n
});\n
promise_list.push(last_promise);\n
\n \n
return this;\n return this;\n
};\n };\n
...@@ -1057,128 +1044,9 @@ define("rsvp/timeout",\n ...@@ -1057,128 +1044,9 @@ define("rsvp/timeout",\n
__exports__.delay = delay;\n __exports__.delay = delay;\n
__exports__.timeout = timeout;\n __exports__.timeout = timeout;\n
});\n });\n
define("rsvp/watcher",\n
["rsvp/promise","rsvp/queue","rsvp/cancellation_error","exports"],\n
function(__dependency1__, __dependency2__, __dependency3__, __exports__) {\n
"use strict";\n
var Promise = __dependency1__.Promise;\n
var Queue = __dependency2__.Queue;\n
var CancellationError = __dependency3__.CancellationError;\n
\n
// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Error\n
function ResolvedMonitorError(message) {\n
this.name = "resolved";\n
if ((message !== undefined) && (typeof message !== "string")) {\n
throw new TypeError(\'You must pass a string.\');\n
}\n
this.message = message || "Default Message";\n
}\n
ResolvedMonitorError.prototype = new Error();\n
ResolvedMonitorError.prototype.constructor = ResolvedMonitorError;\n
\n
function isFunction(x){\n
return typeof x === "function";\n
}\n
\n
var Monitor = function() {\n
var monitor = this,\n
promise_list = [],\n
promise,\n
reject,\n
notify,\n
resolved;\n
\n
if (!(this instanceof Monitor)) {\n
return new Monitor();\n
}\n
\n
function canceller() {\n
var len = promise_list.length,\n
i;\n
for (i = 0; i < len; i += 1) {\n
promise_list[i].cancel();\n
}\n
// Clean it to speed up other canceller run\n
promise_list = [];\n
}\n
\n
promise = new Promise(function(done, fail, progress) {\n
reject = function (rejectedReason) {\n
if (resolved) {return;}\n
monitor.isRejected = true;\n
monitor.rejectedReason = rejectedReason ;\n
resolved = true;\n
canceller();\n
return fail(rejectedReason);\n
};\n
notify = progress;\n
}, canceller);\n
\n
monitor.cancel = function () {\n
if (resolved) {return;}\n
resolved = true;\n
promise.cancel();\n
promise.fail(function (rejectedReason) {\n
monitor.isRejected = true;\n
monitor.rejectedReason = rejectedReason;\n
});\n
};\n
monitor.then = function () {\n
return promise.then.apply(promise, arguments);\n
};\n
\n
monitor.monitor = function(promise_to_monitor) {\n
if (resolved) {\n
throw new ResolvedMonitorError();\n
}\n
var queue = new Queue()\n
.push(function () {\n
return promise_to_monitor;\n
})\n
.push(function (fulfillmentValue) {\n
// Promise to monitor is fullfilled, remove it from the list\n
var len = promise_list.length,\n
promise_to_monitor,\n
new_promise_list = [],\n
i;\n
for (i = 0; i < len; i += 1) {\n
promise_to_monitor = promise_list[i];\n
if (!(promise_to_monitor.isFulfilled ||\n
promise_to_monitor.isRejected)) {\n
new_promise_list.push(promise_to_monitor);\n
}\n
}\n
promise_list = new_promise_list;\n
}, function (rejectedReason) {\n
if (rejectedReason instanceof CancellationError) {\n
if (!(promise_to_monitor.isFulfilled && promise_to_monitor.isRejected)) {\n
// The queue could be cancelled before the first push is run\n
promise_to_monitor.cancel();\n
}\n
}\n
reject(rejectedReason);\n
throw rejectedReason;\n
}, function (notificationValue) {\n
notify(notificationValue);\n
return notificationValue;\n
});\n
\n
promise_list.push(queue);\n
\n
return this;\n
};\n
};\n
\n
Monitor.prototype = Object.create(Promise.prototype);\n
Monitor.prototype.constructor = Monitor;\n
\n
\n
__exports__.Monitor = Monitor;\n
__exports__.ResolvedMonitorError = ResolvedMonitorError;\n
});\n
define("rsvp",\n define("rsvp",\n
["rsvp/events","rsvp/cancellation_error","rsvp/promise","rsvp/node","rsvp/all","rsvp/queue","rsvp/watcher","rsvp/timeout","rsvp/hash","rsvp/rethrow","rsvp/defer","rsvp/config","rsvp/resolve","rsvp/reject","exports"],\n ["rsvp/events","rsvp/cancellation_error","rsvp/promise","rsvp/node","rsvp/all","rsvp/queue","rsvp/timeout","rsvp/hash","rsvp/rethrow","rsvp/defer","rsvp/config","rsvp/resolve","rsvp/reject","exports"],\n
function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __exports__) {\n function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __exports__) {\n
"use strict";\n "use strict";\n
var EventTarget = __dependency1__.EventTarget;\n var EventTarget = __dependency1__.EventTarget;\n
var CancellationError = __dependency2__.CancellationError;\n var CancellationError = __dependency2__.CancellationError;\n
...@@ -1188,16 +1056,14 @@ define("rsvp",\n ...@@ -1188,16 +1056,14 @@ define("rsvp",\n
var any = __dependency5__.any;\n var any = __dependency5__.any;\n
var Queue = __dependency6__.Queue;\n var Queue = __dependency6__.Queue;\n
var ResolvedQueueError = __dependency6__.ResolvedQueueError;\n var ResolvedQueueError = __dependency6__.ResolvedQueueError;\n
var Monitor = __dependency7__.Monitor;\n var delay = __dependency7__.delay;\n
var ResolvedMonitorError = __dependency7__.ResolvedMonitorError;\n var timeout = __dependency7__.timeout;\n
var delay = __dependency8__.delay;\n var hash = __dependency8__.hash;\n
var timeout = __dependency8__.timeout;\n var rethrow = __dependency9__.rethrow;\n
var hash = __dependency9__.hash;\n var defer = __dependency10__.defer;\n
var rethrow = __dependency10__.rethrow;\n var config = __dependency11__.config;\n
var defer = __dependency11__.defer;\n var resolve = __dependency12__.resolve;\n
var config = __dependency12__.config;\n var reject = __dependency13__.reject;\n
var resolve = __dependency13__.resolve;\n
var reject = __dependency14__.reject;\n
\n \n
function configure(name, value) {\n function configure(name, value) {\n
config[name] = value;\n config[name] = value;\n
...@@ -1211,8 +1077,6 @@ define("rsvp",\n ...@@ -1211,8 +1077,6 @@ define("rsvp",\n
__exports__.any = any;\n __exports__.any = any;\n
__exports__.Queue = Queue;\n __exports__.Queue = Queue;\n
__exports__.ResolvedQueueError = ResolvedQueueError;\n __exports__.ResolvedQueueError = ResolvedQueueError;\n
__exports__.Monitor = Monitor;\n
__exports__.ResolvedMonitorError = ResolvedMonitorError;\n
__exports__.delay = delay;\n __exports__.delay = delay;\n
__exports__.timeout = timeout;\n __exports__.timeout = timeout;\n
__exports__.hash = hash;\n __exports__.hash = hash;\n
...@@ -1347,7 +1211,7 @@ window.RSVP = requireModule("rsvp");\n ...@@ -1347,7 +1211,7 @@ window.RSVP = requireModule("rsvp");\n
</item> </item>
<item> <item>
<key> <string>actor</string> </key> <key> <string>actor</string> </key>
<value> <string>zope</string> </value> <value> <string>romain</string> </value>
</item> </item>
<item> <item>
<key> <string>comment</string> </key> <key> <string>comment</string> </key>
...@@ -1361,7 +1225,7 @@ window.RSVP = requireModule("rsvp");\n ...@@ -1361,7 +1225,7 @@ window.RSVP = requireModule("rsvp");\n
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>936.7406.33851.57122</string> </value> <value> <string>937.690.6828.44612</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -1379,7 +1243,7 @@ window.RSVP = requireModule("rsvp");\n ...@@ -1379,7 +1243,7 @@ window.RSVP = requireModule("rsvp");\n
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1405933454.76</float> <float>1410857997.29</float>
<string>GMT</string> <string>GMT</string>
</tuple> </tuple>
</state> </state>
......
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_renderjs_js.xml
View file @ 2f7b81cc
...@@ -101,6 +101,16 @@ ...@@ -101,6 +101,16 @@
<key> <string>text_content</string> </key> <key> <string>text_content</string> </key>
<value> <string encoding="cdata"><![CDATA[ <value> <string encoding="cdata"><![CDATA[
// IE does not support have Document.prototype.contains.\n
if (typeof document.contains != \'function\') {\n
Document.prototype.contains = function(node) {\n
if (node === this || node.parentNode === this)\n
return true;\n
return this.documentElement.contains(node);\n
}\n
}\n
\n
\n
/*\n /*\n
* js_channel is a very lightweight abstraction on top of\n * js_channel is a very lightweight abstraction on top of\n
* postMessage which defines message formats and semantics\n * postMessage which defines message formats and semantics\n
...@@ -760,35 +770,9 @@ ...@@ -760,35 +770,9 @@
};\n };\n
}(DOMParser));\n }(DOMParser));\n
\n \n
;var DOMattachCSS = \'data:text/css;base64,QGtleWZyYW1lcyBub2RlSW5zZXJ0ZWQgeyAgCiAgICBmcm9tIHsgIAogICAgICAgIG91dGxpbmUtY29sb3I6ICNmZmY7IAogICAgfQogICAgdG8geyAgCiAgICAgICAgb3V0bGluZS1jb2xvcjogIzAwMDsKICAgIH0gCn0KCkAtbW96LWtleWZyYW1lcyBub2RlSW5zZXJ0ZWQgeyAgCiAgICBmcm9tIHsgIAogICAgICAgIG91dGxpbmUtY29sb3I6ICNmZmY7IAogICAgfQogICAgdG8geyAgCiAgICAgICAgb3V0bGluZS1jb2xvcjogIzAwMDsKICAgIH0gIAp9CgpALXdlYmtpdC1rZXlmcmFtZXMgbm9kZUluc2VydGVkIHsgIAogICAgZnJvbSB7ICAKICAgICAgICBvdXRsaW5lLWNvbG9yOiAjZmZmOyAKICAgIH0KICAgIHRvIHsgIAogICAgICAgIG91dGxpbmUtY29sb3I6ICMwMDA7CiAgICB9ICAKfQoKW2RhdGEtZ2FkZ2V0LXVybF0gewogICAgYW5pbWF0aW9uLWR1cmF0aW9uOiAwLjAxczsKICAgIC1tb3otYW5pbWF0aW9uLWR1cmF0aW9uOiAwLjAxczsKICAgIC13ZWJraXQtYW5pbWF0aW9uLWR1cmF0aW9uOiAwLjAxczsKICAgIGFuaW1hdGlvbi1uYW1lOiBub2RlSW5zZXJ0ZWQ7CiAgICAtbW96LWFuaW1hdGlvbi1uYW1lOiBub2RlSW5zZXJ0ZWQ7CiAgICAtd2Via2l0LWFuaW1hdGlvbi1uYW1lOiBub2RlSW5zZXJ0ZWQ7Cn0K\';;/*! RenderJs */\n ;/*! RenderJs */\n
/*jslint nomen: true*/\n /*jslint nomen: true*/\n
\n \n
function promiseEventListener(target, type, useCapture) {\n
"use strict";\n
//////////////////////////\n
// Resolve the promise as soon as the event is triggered\n
// eventListener is removed when promise is cancelled/resolved/rejected\n
//////////////////////////\n
var handle_event_callback;\n
\n
function canceller() {\n
target.removeEventListener(type, handle_event_callback, useCapture);\n
}\n
\n
function resolver(resolve) {\n
handle_event_callback = function (evt) {\n
canceller();\n
evt.stopPropagation();\n
evt.preventDefault();\n
resolve(evt);\n
return false;\n
};\n
\n
target.addEventListener(type, handle_event_callback, useCapture);\n
}\n
return new RSVP.Promise(resolver, canceller);\n
}\n
\n
function loopEventListener(target, type, useCapture, callback) {\n function loopEventListener(target, type, useCapture, callback) {\n
"use strict";\n "use strict";\n
//////////////////////////\n //////////////////////////\n
...@@ -838,8 +822,8 @@ function loopEventListener(target, type, useCapture, callback) {\n ...@@ -838,8 +822,8 @@ function loopEventListener(target, type, useCapture, callback) {\n
* renderJs - Generic Gadget library renderer.\n * renderJs - Generic Gadget library renderer.\n
* http://www.renderjs.org/documentation\n * http://www.renderjs.org/documentation\n
*/\n */\n
(function (document, window, RSVP, DOMParser, Channel, DOMattachCSS,\n (function (document, window, RSVP, DOMParser, Channel, MutationObserver,\n
undefined) {\n Node, undefined) {\n
"use strict";\n "use strict";\n
\n \n
var gadget_model_dict = {},\n var gadget_model_dict = {},\n
...@@ -847,9 +831,12 @@ function loopEventListener(target, type, useCapture, callback) {\n ...@@ -847,9 +831,12 @@ function loopEventListener(target, type, useCapture, callback) {\n
stylesheet_registration_dict = {},\n stylesheet_registration_dict = {},\n
gadget_loading_klass,\n gadget_loading_klass,\n
loading_klass_promise,\n loading_klass_promise,\n
waitForDomAttachment,\n renderJS,\n
renderJS;\n Monitor;\n
\n \n
/////////////////////////////////////////////////////////////////\n
// Helper functions\n
/////////////////////////////////////////////////////////////////\n
function removeHash(url) {\n function removeHash(url) {\n
var index = url.indexOf(\'#\');\n var index = url.indexOf(\'#\');\n
if (index > 0) {\n if (index > 0) {\n
...@@ -857,33 +844,8 @@ function loopEventListener(target, type, useCapture, callback) {\n ...@@ -857,33 +844,8 @@ function loopEventListener(target, type, useCapture, callback) {\n
}\n }\n
return url;\n return url;\n
}\n }\n
\n
/////////////////////////////////////////////////////////////////\n
// RenderJSGadget\n
/////////////////////////////////////////////////////////////////\n
function RenderJSGadget() {\n
if (!(this instanceof RenderJSGadget)) {\n
return new RenderJSGadget();\n
}\n
}\n
// RenderJSGadget.prototype.__monitor = RSVP.reject(new Error("No monitor"));\n
RenderJSGadget.prototype.__title = "";\n
RenderJSGadget.prototype.__interface_list = [];\n
RenderJSGadget.prototype.__path = "";\n
RenderJSGadget.prototype.__html = "";\n
RenderJSGadget.prototype.__required_css_list = [];\n
RenderJSGadget.prototype.__required_js_list = [];\n
\n
// function dError(error) {\n
// console.error(error);\n
// alert(error);\n
// }\n
\n \n
function letsCrash(e) {\n function letsCrash(e) {\n
console.error(e);\n
console.error(e.stack);\n
// XXX Do not crash the application if it fails\n
// Where to write the error?\n
if (e.constructor === XMLHttpRequest) {\n if (e.constructor === XMLHttpRequest) {\n
e = {\n e = {\n
readyState: e.readyState,\n readyState: e.readyState,\n
...@@ -898,18 +860,149 @@ function loopEventListener(target, type, useCapture, callback) {\n ...@@ -898,18 +860,149 @@ function loopEventListener(target, type, useCapture, callback) {\n
try {\n try {\n
e = JSON.stringify(e);\n e = JSON.stringify(e);\n
} catch (ignore) {\n } catch (ignore) {\n
// console.error(exception);\n
}\n }\n
}\n }\n
// console.warn(e);\n
document.getElementsByTagName(\'body\')[0].textContent = e;\n document.getElementsByTagName(\'body\')[0].textContent = e;\n
// XXX Do not crash the application if it fails\n
// Where to write the error?\n
/*global console*/\n
console.error(e.stack);\n
console.error(e);\n
}\n
\n
/////////////////////////////////////////////////////////////////\n
// Service Monitor promise\n
/////////////////////////////////////////////////////////////////\n
function ResolvedMonitorError(message) {\n
this.name = "resolved";\n
if ((message !== undefined) && (typeof message !== "string")) {\n
throw new TypeError(\'You must pass a string.\');\n
}\n
this.message = message || "Default Message";\n
}\n
ResolvedMonitorError.prototype = new Error();\n
ResolvedMonitorError.prototype.constructor = ResolvedMonitorError;\n
\n
Monitor = function () {\n
var monitor = this,\n
promise_list = [],\n
promise,\n
reject,\n
notify,\n
resolved;\n
\n
if (!(this instanceof Monitor)) {\n
return new Monitor();\n
}\n
\n
function canceller() {\n
var len = promise_list.length,\n
i;\n
for (i = 0; i < len; i += 1) {\n
promise_list[i].cancel();\n
}\n
// Clean it to speed up other canceller run\n
promise_list = [];\n
}\n
\n
promise = new RSVP.Promise(function (done, fail, progress) {\n
reject = function (rejectedReason) {\n
if (resolved) {\n
return;\n
}\n }\n
monitor.isRejected = true;\n
monitor.rejectedReason = rejectedReason;\n
resolved = true;\n
canceller();\n
return fail(rejectedReason);\n
};\n
notify = progress;\n
}, canceller);\n
\n
monitor.cancel = function () {\n
if (resolved) {\n
return;\n
}\n
resolved = true;\n
promise.cancel();\n
promise.fail(function (rejectedReason) {\n
monitor.isRejected = true;\n
monitor.rejectedReason = rejectedReason;\n
});\n
};\n
monitor.then = function () {\n
return promise.then.apply(promise, arguments);\n
};\n
monitor.fail = function () {\n
return promise.fail.apply(promise, arguments);\n
};\n
\n
monitor.monitor = function (promise_to_monitor) {\n
if (resolved) {\n
throw new ResolvedMonitorError();\n
}\n
var queue = new RSVP.Queue()\n
.push(function () {\n
return promise_to_monitor;\n
})\n
.push(function (fulfillmentValue) {\n
// Promise to monitor is fullfilled, remove it from the list\n
var len = promise_list.length,\n
sub_promise_to_monitor,\n
new_promise_list = [],\n
i;\n
for (i = 0; i < len; i += 1) {\n
sub_promise_to_monitor = promise_list[i];\n
if (!(sub_promise_to_monitor.isFulfilled ||\n
sub_promise_to_monitor.isRejected)) {\n
new_promise_list.push(sub_promise_to_monitor);\n
}\n
}\n
promise_list = new_promise_list;\n
}, function (rejectedReason) {\n
if (rejectedReason instanceof RSVP.CancellationError) {\n
if (!(promise_to_monitor.isFulfilled &&\n
promise_to_monitor.isRejected)) {\n
// The queue could be cancelled before the first push is run\n
promise_to_monitor.cancel();\n
}\n
}\n
reject(rejectedReason);\n
throw rejectedReason;\n
}, function (notificationValue) {\n
notify(notificationValue);\n
return notificationValue;\n
});\n
\n
promise_list.push(queue);\n
\n
return this;\n
};\n
};\n
\n
Monitor.prototype = Object.create(RSVP.Promise.prototype);\n
Monitor.prototype.constructor = Monitor;\n
\n
/////////////////////////////////////////////////////////////////\n
// RenderJSGadget\n
/////////////////////////////////////////////////////////////////\n
function RenderJSGadget() {\n
if (!(this instanceof RenderJSGadget)) {\n
return new RenderJSGadget();\n
}\n
}\n
RenderJSGadget.prototype.__title = "";\n
RenderJSGadget.prototype.__interface_list = [];\n
RenderJSGadget.prototype.__path = "";\n
RenderJSGadget.prototype.__html = "";\n
RenderJSGadget.prototype.__required_css_list = [];\n
RenderJSGadget.prototype.__required_js_list = [];\n
\n \n
function createMonitor(g) {\n function createMonitor(g) {\n
if (g.__monitor !== undefined) {\n if (g.__monitor !== undefined) {\n
g.__monitor.cancel();\n g.__monitor.cancel();\n
}\n }\n
g.__monitor = new RSVP.Monitor();\n g.__monitor = new Monitor();\n
g.__monitor.fail(function (error) {\n g.__monitor.fail(function (error) {\n
if (!(error instanceof RSVP.CancellationError)) {\n if (!(error instanceof RSVP.CancellationError)) {\n
return g.aq_reportServiceError(error);\n return g.aq_reportServiceError(error);\n
...@@ -972,134 +1065,13 @@ function loopEventListener(target, type, useCapture, callback) {\n ...@@ -972,134 +1065,13 @@ function loopEventListener(target, type, useCapture, callback) {\n
for (i = 0; i < service_list.length; i += 1) {\n for (i = 0; i < service_list.length; i += 1) {\n
gadget.__monitor.monitor(service_list[i].apply(gadget));\n gadget.__monitor.monitor(service_list[i].apply(gadget));\n
}\n }\n
// + listen for DOM detach\n
function checkDetachEvent(evt) {\n
// gadget.__monitor.cancel("Et hop");\n
// if (evt.eventPhase === 2) {\n
// console.log("Removed from DOM");\n
// var previous_monitor = gadget.__monitor;\n
createMonitor(gadget);\n
// previous_monitor.cancel("Removed from DOM");\n
gadget.__monitor.monitor(waitForDomAttachment(gadget));\n
// gadget_instance.__monitor = new RSVP.Monitor();\n
// startService(gadget_instance);\n
// evt.stopPropagation();\n
// evt.preventDefault();\n
// return false;\n
// }\n
}\n
gadget.__monitor.monitor(\n
loopEventListener(\n
gadget.__element,\n
"DOMNodeRemovedFromDocument",\n
false,\n
checkDetachEvent\n
)\n
);\n
\n
})\n })\n
);\n );\n
\n
}\n }\n
\n \n
waitForDomAttachment = function (gadget) {\n
function waitForAnimationEvent(event_name) {\n
gadget.__monitor.monitor(\n
new RSVP.Queue()\n
.push(function () {\n
return promiseEventListener(\n
gadget.__element,\n
event_name,\n
false\n
);\n
})\n
.push(function (evt) {\n
if (evt.eventPhase === 2) {\n
if (evt.animationName === \'nodeInserted\') {\n
// if (evt.target === gadget_instance.__element) {\n
createMonitor(gadget);\n
startService(gadget);\n
// evt.stopPropagation();\n
// evt.preventDefault();\n
return false;\n
}\n
}\n
})\n
\n
);\n
}\n
\n
gadget.__monitor.monitor(waitForAnimationEvent("animationstart"));\n
gadget.__monitor.monitor(waitForAnimationEvent("webkitAnimationStart"));\n
\n
// gadget.__monitor.monitor(new RSVP.Queue()\n
// .push(function () {\n
// // + listen for DOM attach\n
// })\n
// );\n
//\n
//\n
//\n
// gadget_instance.__element.addEventListener(\n
// // "DOMNodeRemovedFromDocument",\n
// "animationstart",\n
// function (evt) {\n
// // console.log("Inserted: " + gadget_instance);\n
// // console.log(evt);\n
// // console.log(gadget_instance.__element);\n
// if (evt.eventPhase === 2) {\n
// if (evt.animationName === \'nodeInserted\') {\n
// // if (evt.target === gadget_instance.__element) {\n
// createMonitor(gadget_instance);\n
// startService(gadget_instance);\n
// evt.stopPropagation();\n
// evt.preventDefault();\n
// return false;\n
// }\n
// }\n
// // console.log(evt);\n
// },\n
// false\n
// );\n
//\n
// gadget_instance.__element.addEventListener(\n
// // "DOMNodeRemovedFromDocument",\n
// "webkitAnimationStart",\n
// function (evt) {\n
// // console.log("Inserted: " + gadget_instance);\n
// // console.log(evt);\n
// // console.log(gadget_instance.__element);\n
// if (evt.eventPhase === 2) {\n
// if (evt.animationName === \'nodeInserted\') {\n
// // if (evt.target === gadget_instance.__element) {\n
// createMonitor(gadget_instance);\n
// startService(gadget_instance);\n
// evt.stopPropagation();\n
// evt.preventDefault();\n
// return false;\n
// }\n
// }\n
// // console.log(evt);\n
// },\n
// false\n
// );\n
\n
\n
\n
\n
\n
\n
};\n
/////////////////////////////////////////////////////////////////\n /////////////////////////////////////////////////////////////////\n
// RenderJSGadget.declareMethod\n // RenderJSGadget.declareMethod\n
/////////////////////////////////////////////////////////////////\n /////////////////////////////////////////////////////////////////\n
// function checkIfMonitorFailed(gadget, result) {\n
// if (gadget.hasOwnProperty("__monitor")) {\n
// // Do not use queue, as\n
// return gadget.__monitor.then(function () {return ;});\n
//\n
// }\n
\n
RenderJSGadget.declareMethod = function (name, callback) {\n RenderJSGadget.declareMethod = function (name, callback) {\n
this.prototype[name] = function () {\n this.prototype[name] = function () {\n
var context = this,\n var context = this,\n
...@@ -1107,15 +1079,7 @@ function loopEventListener(target, type, useCapture, callback) {\n ...@@ -1107,15 +1079,7 @@ function loopEventListener(target, type, useCapture, callback) {\n
\n \n
return new RSVP.Queue()\n return new RSVP.Queue()\n
.push(function () {\n .push(function () {\n
var result = callback.apply(context, argument_list);\n return callback.apply(context, argument_list);\n
// if (context.hasOwnProperty("__monitor")) {\n
// result = RSVP.any([\n
// result,\n
// // monitor is never supposed to succeed\n
// context.__monitor.then(function () {return; })\n
// ]);\n
// }\n
return result;\n
});\n });\n
};\n };\n
// Allow chain\n // Allow chain\n
...@@ -1158,8 +1122,6 @@ function loopEventListener(target, type, useCapture, callback) {\n ...@@ -1158,8 +1122,6 @@ function loopEventListener(target, type, useCapture, callback) {\n
var gadget = this,\n var gadget = this,\n
key,\n key,\n
gadget_scope;\n gadget_scope;\n
// console.log("Acquiring " + method_name);\n
// console.log(argument_list);\n
\n \n
for (key in gadget.__sub_gadget_dict) {\n for (key in gadget.__sub_gadget_dict) {\n
if (gadget.__sub_gadget_dict.hasOwnProperty(key)) {\n if (gadget.__sub_gadget_dict.hasOwnProperty(key)) {\n
...@@ -1195,26 +1157,33 @@ function loopEventListener(target, type, useCapture, callback) {\n ...@@ -1195,26 +1157,33 @@ function loopEventListener(target, type, useCapture, callback) {\n
gadget = this;\n gadget = this;\n
return new RSVP.Queue()\n return new RSVP.Queue()\n
.push(function () {\n .push(function () {\n
var result = gadget.__aq_parent(method_name_to_acquire,\n return gadget.__aq_parent(method_name_to_acquire, argument_list);\n
argument_list);\n
// if (gadget.hasOwnProperty("__monitor")) {\n
// result = RSVP.any([\n
// result,\n
// // monitor is never supposed to succeed\n
// gadget.__monitor.then(function () {return; })\n
// ]);\n
// }\n
return result;\n
});\n });\n
};\n };\n
\n \n
// Allow chain\n // Allow chain\n
return this;\n return this;\n
};\n };\n
RenderJSGadget.declareAcquiredMethod("aq_pleasePublishMyState",\n
"pleasePublishMyState");\n
RenderJSGadget.declareAcquiredMethod("aq_reportServiceError",\n RenderJSGadget.declareAcquiredMethod("aq_reportServiceError",\n
"reportServiceError");\n "reportServiceError");\n
RenderJSGadget.declareAcquiredMethod("aq_pleasePublishMyState",\n
"pleasePublishMyState");\n
\n
function pleasePublishMyState(param_list, child_gadget_scope) {\n
var new_param = {},\n
key;\n
for (key in this.state_parameter_dict) {\n
if (this.state_parameter_dict.hasOwnProperty(key)) {\n
new_param[key] = this.state_parameter_dict[key];\n
}\n
}\n
if (child_gadget_scope === undefined) {\n
throw new Error("gadget scope is mandatory");\n
}\n
new_param[child_gadget_scope] = param_list[0];\n
param_list = [new_param];\n
return this.aq_pleasePublishMyState.apply(this, param_list);\n
}\n
\n \n
/////////////////////////////////////////////////////////////////\n /////////////////////////////////////////////////////////////////\n
// RenderJSGadget.allowPublicAcquisition\n // RenderJSGadget.allowPublicAcquisition\n
...@@ -1234,22 +1203,6 @@ function loopEventListener(target, type, useCapture, callback) {\n ...@@ -1234,22 +1203,6 @@ function loopEventListener(target, type, useCapture, callback) {\n
argument_list]);\n argument_list]);\n
};\n };\n
}\n }\n
\n
function pleasePublishMyState(param_list, child_gadget_scope) {\n
var new_param = {},\n
key;\n
for (key in this.state_parameter_dict) {\n
if (this.state_parameter_dict.hasOwnProperty(key)) {\n
new_param[key] = this.state_parameter_dict[key];\n
}\n
}\n
if (child_gadget_scope === undefined) {\n
throw new Error("gadget scope is mandatory");\n
}\n
new_param[child_gadget_scope] = param_list[0];\n
param_list = [new_param];\n
return this.aq_pleasePublishMyState.apply(this, param_list);\n
}\n
\n \n
/////////////////////////////////////////////////////////////////\n /////////////////////////////////////////////////////////////////\n
// RenderJSEmbeddedGadget\n // RenderJSEmbeddedGadget\n
...@@ -1518,39 +1471,14 @@ function loopEventListener(target, type, useCapture, callback) {\n ...@@ -1518,39 +1471,14 @@ function loopEventListener(target, type, useCapture, callback) {\n
gadget_instance.__element.setAttribute("data-gadget-url", url);\n gadget_instance.__element.setAttribute("data-gadget-url", url);\n
gadget_instance.__element.setAttribute("data-gadget-sandbox",\n gadget_instance.__element.setAttribute("data-gadget-sandbox",\n
options.sandbox);\n options.sandbox);\n
gadget_instance.__element._gadget = gadget_instance;\n
\n \n
if (document.contains(gadget_instance.__element)) {\n if (document.contains(gadget_instance.__element)) {\n
// Put a timeout\n // Put a timeout\n
queue.push(startService);\n queue.push(startService);\n
} else {\n
// Listen for DOM attachment\n
queue.push(waitForDomAttachment);\n
}\n }\n
// Always return the gadget instance after ready function\n // Always return the gadget instance after ready function\n
queue.push(ready_wrapper);\n queue.push(ready_wrapper);\n
\n
// console.log(document.contains(gadget_instance.__element));\n
\n
// gadget_instance.__element.addEventListener(\n
// // "DOMNodeRemovedFromDocument",\n
// "DOMNodeRemoved",\n
// function (evt) {\n
// // console.log("Dropped: " + gadget_instance);\n
// // if (evt.target === gadget_instance.__element) {\n
// if (evt.eventPhase === 2) {\n
// gadget_instance.__monitor.cancel("Removed from DOM");\n
// evt.stopPropagation();\n
// evt.preventDefault();\n
// return false;\n
// }\n
// },\n
// false\n
// );\n
\n
// gadget_instance.__element.unload = function () {\n
// alert("couscous");\n
// };\n
\n
\n \n
return gadget_instance;\n return gadget_instance;\n
});\n });\n
...@@ -2093,12 +2021,77 @@ function loopEventListener(target, type, useCapture, callback) {\n ...@@ -2093,12 +2021,77 @@ function loopEventListener(target, type, useCapture, callback) {\n
stylesheet_registration_dict[css_list[i]] = null;\n stylesheet_registration_dict[css_list[i]] = null;\n
}\n }\n
gadget_loading_klass = undefined;\n gadget_loading_klass = undefined;\n
return renderJS.declareCSS(DOMattachCSS);\n
}).then(function () {\n }).then(function () {\n
\n
// select the target node\n
var target = document.querySelector(\'body\'),\n
// create an observer instance\n
observer = new MutationObserver(function (mutations) {\n
var i, k, len, len2, node, added_list;\n
mutations.forEach(function (mutation) {\n
if (mutation.type === \'childList\') {\n
\n
len = mutation.removedNodes.length;\n
for (i = 0; i < len; i += 1) {\n
node = mutation.removedNodes[i];\n
if (node.nodeType === Node.ELEMENT_NODE) {\n
if (node.hasAttribute("data-gadget-url") &&\n
(node._gadget !== undefined)) {\n
createMonitor(node._gadget);\n
}\n
added_list =\n
node.querySelectorAll("[data-gadget-url]");\n
len2 = added_list.length;\n
for (k = 0; k < len2; k += 1) {\n
node = added_list[k];\n
if (node._gadget !== undefined) {\n
createMonitor(node._gadget);\n
}\n
}\n
}\n
}\n
\n
len = mutation.addedNodes.length;\n
for (i = 0; i < len; i += 1) {\n
node = mutation.addedNodes[i];\n
if (node.nodeType === Node.ELEMENT_NODE) {\n
if (node.hasAttribute("data-gadget-url") &&\n
(node._gadget !== undefined)) {\n
if (document.contains(node)) {\n
startService(node._gadget);\n
}\n
}\n
added_list =\n
node.querySelectorAll("[data-gadget-url]");\n
len2 = added_list.length;\n
for (k = 0; k < len2; k += 1) {\n
node = added_list[k];\n
if (document.contains(node)) {\n
if (node._gadget !== undefined) {\n
startService(node._gadget);\n
}\n
}\n
}\n
}\n
}\n
\n
}\n
});\n
}),\n
// configuration of the observer:\n
config = {\n
childList: true,\n
subtree: true,\n
attributes: false,\n
characterData: false\n
};\n
\n
// pass in the target node, as well as the observer options\n
observer.observe(target, config);\n
\n
return root_gadget;\n return root_gadget;\n
}).then(resolve, function (e) {\n }).then(resolve, function (e) {\n
reject(e);\n reject(e);\n
/*global console */\n
console.error(e);\n console.error(e);\n
throw e;\n throw e;\n
});\n });\n
...@@ -2142,19 +2135,7 @@ function loopEventListener(target, type, useCapture, callback) {\n ...@@ -2142,19 +2135,7 @@ function loopEventListener(target, type, useCapture, callback) {\n
.push(ready_wrapper);\n .push(ready_wrapper);\n
}\n }\n
});\n });\n
if (window.self !== window.top) {\n if (window.self === window.top) {\n
// Inform parent window that gadget is correctly loaded\n
loading_gadget_promise\n
.then(function () {\n
gadget_ready = true;\n
notifyReady();\n
})\n
.fail(function (e) {\n
embedded_channel.notify({method: "failed", params: e.toString()});\n
throw e;\n
});\n
} else {\n
// XXX Bootstrap run\n
loading_gadget_promise\n loading_gadget_promise\n
.then(function () {\n .then(function () {\n
\n \n
...@@ -2217,23 +2198,28 @@ function loopEventListener(target, type, useCapture, callback) {\n ...@@ -2217,23 +2198,28 @@ function loopEventListener(target, type, useCapture, callback) {\n
loopEventListener(window, \'hashchange\', false,\n loopEventListener(window, \'hashchange\', false,\n
extractHashAndDispatch)\n extractHashAndDispatch)\n
]);\n ]);\n
\n })\n
}).fail(function (e) {\n .fail(function (e) {\n
letsCrash(e);\n letsCrash(e);\n
throw e;\n
});\n });\n
\n } else {\n
\n // Inform parent window that gadget is correctly loaded\n
}\n
loading_gadget_promise\n loading_gadget_promise\n
.then(function () {\n
gadget_ready = true;\n
notifyReady();\n
})\n
.fail(function (e) {\n .fail(function (e) {\n
console.error(e);\n embedded_channel.notify({method: "failed", params: e.toString()});\n
throw e;\n throw e;\n
});\n });\n
}\n
\n \n
}\n }\n
bootstrap();\n bootstrap();\n
\n \n
}(document, window, RSVP, DOMParser, Channel, DOMattachCSS));\n }(document, window, RSVP, DOMParser, Channel, MutationObserver, Node));\n
]]></string> </value> ]]></string> </value>
...@@ -2357,7 +2343,7 @@ function loopEventListener(target, type, useCapture, callback) {\n ...@@ -2357,7 +2343,7 @@ function loopEventListener(target, type, useCapture, callback) {\n
</item> </item>
<item> <item>
<key> <string>actor</string> </key> <key> <string>actor</string> </key>
<value> <string>sven</string> </value> <value> <string>romain</string> </value>
</item> </item>
<item> <item>
<key> <string>comment</string> </key> <key> <string>comment</string> </key>
...@@ -2371,7 +2357,7 @@ function loopEventListener(target, type, useCapture, callback) {\n ...@@ -2371,7 +2357,7 @@ function loopEventListener(target, type, useCapture, callback) {\n
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>936.57662.10223.7219</string> </value> <value> <string>937.39596.23974.43622</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -2389,7 +2375,7 @@ function loopEventListener(target, type, useCapture, callback) {\n ...@@ -2389,7 +2375,7 @@ function loopEventListener(target, type, useCapture, callback) {\n
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1408020541.67</float> <float>1410871234.37</float>
<string>GMT</string> <string>GMT</string>
</tuple> </tuple>
</state> </state>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7