[Jifty-commit] r1478 - in jifty/trunk: share/web/static/js
jifty-commit at lists.jifty.org
jifty-commit at lists.jifty.org
Tue Jul 4 17:23:19 EDT 2006
Author: alexmv
Date: Tue Jul 4 17:23:19 2006
New Revision: 1478
Modified:
jifty/trunk/ (props changed)
jifty/trunk/share/web/static/js/jifty.js
Log:
r14841 at zoq-fot-pik: chmrr | 2006-07-04 17:23:11 -0400
* Remove non-useful try { ... } finally{} block
* Add try { ... } cach (e) { ... } around effect creation
Modified: jifty/trunk/share/web/static/js/jifty.js
==============================================================================
--- jifty/trunk/share/web/static/js/jifty.js (original)
+++ jifty/trunk/share/web/static/js/jifty.js Tue Jul 4 17:23:19 2006
@@ -601,92 +601,95 @@
// And when we get the result back..
var onSuccess = function(transport, object) {
- // In case there's no XML in the response, or what have you
- try {
- // Grab the XML response
- var response = transport.responseXML.documentElement;
+ // Grab the XML response
+ var response = transport.responseXML.documentElement;
- // For each fragment we requested
- for (var i = 0; i < named_args['fragments'].length; i++) {
- var f = named_args['fragments'][i];
- var element = f['element'];
-
- // Change insertion mode if need be
- var insertion = null;
- if (f['mode'] && (f['mode'] != 'Replace')) {
- insertion = eval('Insertion.'+f['mode']);
- }
+ // For each fragment we requested
+ for (var i = 0; i < named_args['fragments'].length; i++) {
+ var f = named_args['fragments'][i];
+ var element = f['element'];
+
+ // Change insertion mode if need be
+ var insertion = null;
+ if (f['mode'] && (f['mode'] != 'Replace')) {
+ insertion = eval('Insertion.'+f['mode']);
+ }
+
+ // Loop through the result looking for it
+ for (var response_fragment = response.firstChild;
+ response_fragment != null;
+ response_fragment = response_fragment.nextSibling) {
+ if (response_fragment.nodeName == 'fragment') {
+ if (response_fragment.getAttribute("id") == f['region']) {
+ // We found the right fragment
+ var dom_fragment = fragments[f['region']];
+ var new_dom_args = $H();
+
+ for (var fragment_bit = response_fragment.firstChild;
+ fragment_bit != null;
+ fragment_bit = fragment_bit.nextSibling) {
+ if (fragment_bit.nodeName == 'argument') {
+ // First, update the fragment's arguments
+ // with what the server actually used --
+ // this is needed in case there was
+ // argument mapping going on
+ var textContent = '';
+ if (fragment_bit.textContent) {
+ textContent = fragment_bit.textContent;
+ } else if (fragment_bit.firstChild) {
+ textContent = fragment_bit.firstChild.nodeValue;
+ }
+ new_dom_args[fragment_bit.getAttribute("name")] = textContent;
+ } else if (fragment_bit.nodeName == 'content') {
+ var textContent = '';
+ if (fragment_bit.textContent) {
+ textContent = fragment_bit.textContent;
+ } else if (fragment_bit.firstChild) {
+ textContent = fragment_bit.firstChild.nodeValue;
+ }
- // Loop through the result looking for it
- for (var response_fragment = response.firstChild;
- response_fragment != null;
- response_fragment = response_fragment.nextSibling) {
- if (response_fragment.nodeName == 'fragment') {
- if (response_fragment.getAttribute("id") == f['region']) {
- // We found the right fragment
- var dom_fragment = fragments[f['region']];
- var new_dom_args = $H();
-
- for (var fragment_bit = response_fragment.firstChild;
- fragment_bit != null;
- fragment_bit = fragment_bit.nextSibling) {
- if (fragment_bit.nodeName == 'argument') {
- // First, update the fragment's arguments
- // with what the server actually used --
- // this is needed in case there was
- // argument mapping going on
- var textContent = '';
- if (fragment_bit.textContent) {
- textContent = fragment_bit.textContent;
- } else if (fragment_bit.firstChild) {
- textContent = fragment_bit.firstChild.nodeValue;
- }
- new_dom_args[fragment_bit.getAttribute("name")] = textContent;
- } else if (fragment_bit.nodeName == 'content') {
- var textContent = '';
- if (fragment_bit.textContent) {
- textContent = fragment_bit.textContent;
- } else if (fragment_bit.firstChild) {
- textContent = fragment_bit.firstChild.nodeValue;
- }
-
- // Once we find it, do the insertion
- if (insertion) {
- new insertion(element, textContent.stripScripts());
- } else {
- Element.update(element, textContent.stripScripts());
- }
- // We need to give the browser some "settle" time before we eval scripts in the body
- setTimeout((function() { this.evalScripts() }).bind(textContent), 10);
- Behaviour.apply(f['element']);
+ // Once we find it, do the insertion
+ if (insertion) {
+ new insertion(element, textContent.stripScripts());
+ } else {
+ Element.update(element, textContent.stripScripts());
}
+ // We need to give the browser some "settle" time before we eval scripts in the body
+ setTimeout((function() { this.evalScripts() }).bind(textContent), 10);
+ Behaviour.apply(f['element']);
}
- dom_fragment.setArgs(new_dom_args);
}
+ dom_fragment.setArgs(new_dom_args);
}
}
+ }
- // Also, set us up the effect
- if (f['effect']) {
+ // Also, set us up the effect
+ if (f['effect']) {
+ try {
var effect = eval('Effect.'+f['effect']);
var effect_args = f['effect_args'] || {};
- if (f['is_new'])
- Element.hide($('region-'+f['region']));
- (effect)($('region-'+f['region']), effect_args);
+ if (effect) {
+ if (f['is_new'])
+ Element.hide($('region-'+f['region']));
+ (effect)($('region-'+f['region']), effect_args);
+ }
+ } catch ( e ) {
+ // Don't be sad if the effect doesn't exist
}
}
- for (var result = response.firstChild;
- result != null;
- result = result.nextSibling) {
- if (result.nodeName == 'result') {
- for (var key = result.firstChild;
- key != null;
- key = key.nextSibling) {
- show_action_result(result.getAttribute("moniker"),key);
- }
+ }
+ for (var result = response.firstChild;
+ result != null;
+ result = result.nextSibling) {
+ if (result.nodeName == 'result') {
+ for (var key = result.firstChild;
+ key != null;
+ key = key.nextSibling) {
+ show_action_result(result.getAttribute("moniker"),key);
}
}
- } finally { }
+ }
};
var onFailure = function(transport, object) {
alert('No response from server!');
More information about the Jifty-commit
mailing list