Repository: tapestry-5 Updated Branches: refs/heads/master ffeaabc04 -> 7dbbe84c0
Clear the page loading mask, even if there are initialization errors Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/aa836f31 Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/aa836f31 Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/aa836f31 Branch: refs/heads/master Commit: aa836f31f1a8501533e8d598d2013ca25b9822cf Parents: ffeaabc Author: Howard M. Lewis Ship <hls...@apache.org> Authored: Mon Dec 29 15:37:37 2014 -0800 Committer: Howard M. Lewis Ship <hls...@apache.org> Committed: Mon Dec 29 15:37:37 2014 -0800 ---------------------------------------------------------------------- .../META-INF/modules/t5/core/pageinit.coffee | 42 ++++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/aa836f31/tapestry-core/src/main/coffeescript/META-INF/modules/t5/core/pageinit.coffee ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/coffeescript/META-INF/modules/t5/core/pageinit.coffee b/tapestry-core/src/main/coffeescript/META-INF/modules/t5/core/pageinit.coffee index 149d9ea..a72e208 100644 --- a/tapestry-core/src/main/coffeescript/META-INF/modules/t5/core/pageinit.coffee +++ b/tapestry-core/src/main/coffeescript/META-INF/modules/t5/core/pageinit.coffee @@ -85,27 +85,27 @@ define ["underscore", "./console", "./dom", "./events"], require [moduleName], (moduleLib) -> - # Some modules export nothing but do some full-page initialization, such as adding - # event handlers to the body. - if not functionName and - initArguments.length is 0 and - not _.isFunction moduleLib - console.debug "Loaded module #{moduleName}" - tracker() - return - - fn = if functionName? then moduleLib[functionName] else moduleLib - - unless fn? - throw new Error "Could not locate function `#{qualifiedName}'." - - if console.debugEnabled - argsString = (JSON.stringify arg for arg in initArguments).join(", ") - console.debug "Invoking #{qualifiedName}(#{argsString})" - - fn.apply null, initArguments - - tracker() + try + # Some modules export nothing but do some full-page initialization, such as adding + # event handlers to the body. + if not functionName and + initArguments.length is 0 and + not _.isFunction moduleLib + console.debug "Loaded module #{moduleName}" + return + + fn = if functionName? then moduleLib[functionName] else moduleLib + + unless fn? + throw new Error "Could not locate function `#{qualifiedName}'." + + if console.debugEnabled + argsString = (JSON.stringify arg for arg in initArguments).join(", ") + console.debug "Invoking #{qualifiedName}(#{argsString})" + + fn.apply null, initArguments + finally + tracker() # Loads all specified libraries in order (this includes the core stack, other stacks, and # any free-standing libraries). It then executes the initializations. Once all initializations have
