Permalink
Browse files

Removed user info request from user bootstrap as it triggers xJSFL in…

…to thinking there's a file load error.
  • Loading branch information...
1 parent 8808274 commit 115e712faa86671d37ffcb5fed6b89e59bde52d3 @davestewart committed Mar 27, 2012
Showing with 15 additions and 21 deletions.
  1. +15 −18 core/jsfl/install/setup.jsfl
  2. +0 −3 user/jsfl/bootstrap.jsfl
@@ -13,9 +13,6 @@
// ------------------------------------------------------------------------------------------------------------------------
// Setup - sets up user information the first time the framework is run
- // initialise
- xjsfl.init(this);
-
// --------------------------------------------------------------------------------
// functions
@@ -41,31 +38,31 @@
{
config.xml.user[name] = params[name];
}
+ trace('Saving user information to ' + URI.toPath(config.uri, true));
config.save();
}
// setup
- function setup(force)
+ function setup()
{
- var name = config.xml.user.name.toString();
- if( ! name || force)
- {
- XUL
- .factory()
- .load('//core/ui/user.xul')
- .setFlashData({click:'http://www.xjsfl.com/support/setup/quick-start/getting-started'})
- .addEvent('email', 'change', onChange)
- .setButtons('accept')
- .setValues(config.xml.user.*)
- .show(onComplete);
- }
+ XUL
+ .factory()
+ .load('//core/ui/user.xul')
+ .setFlashData({click:'http://www.xjsfl.com/support/setup/quick-start/getting-started'})
+ .addEvent('email', 'change', onChange)
+ .setButtons('accept')
+ .setValues(config.xml.user.*)
+ .show(onComplete);
}
// --------------------------------------------------------------------------------
// code
-
+
+ // initialise
+ xjsfl.init(this);
+
// variables
- var config = new Config('xjsfl.xml');
+ var config = new Config('xjsfl.xml');
// run
setup();
View
@@ -19,9 +19,6 @@
xjsfl.output.log('loading user libraries...', 1);
xjsfl.classes.load('/jsfl/libraries/*.jsfl'); // A leading / path defaults to the curretn root, in this case /xJSFL/user/
- // check that user data is stored (you can remove this if you like)
- xjsfl.file.load('//core/jsfl/install/setup.jsfl');
-
// add any user code here
// e.g. register any placeholder paths

0 comments on commit 115e712

Please sign in to comment.