Skip to content
This repository has been archived by the owner on May 10, 2019. It is now read-only.

Commit

Permalink
user.js now must be evaluated after provisioning.js, reorder includes.
Browse files Browse the repository at this point in the history
  • Loading branch information
@lloyd
lloyd committed Dec 20, 2011
1 parent 3e88cc3 commit 169b49b
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion resources/static/test/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,10 +101,10 @@ <h3>Content below here is test content that can be ignored</h3>
<script type="text/javascript" src="/shared/error-display.js"></script>
<script type="text/javascript" src="/shared/storage.js"></script>
<script type="text/javascript" src="/shared/network.js"></script>
<script type="text/javascript" src="/shared/provisioning.js"></script>
<script type="text/javascript" src="/shared/user.js"></script>
<script type="text/javascript" src="/shared/tooltip.js"></script>
<script type="text/javascript" src="/shared/validation.js"></script>
<script type="text/javascript" src="/shared/provisioning.js"></script>
<script type="text/javascript" src="/shared/helpers.js"></script>

<script type="text/javascript" src="/dialog/resources/internal_api.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion resources/views/layout.ejs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@
<script src="/shared/error-messages.js" type="text/javascript"></script>
<script src="/shared/storage.js" type="text/javascript"></script>
<script src="/shared/network.js" type="text/javascript"></script>
<script src="/shared/provisioning.js" type="text/javascript"></script>
<script src="/shared/user.js" type="text/javascript"></script>
<script src="/shared/tooltip.js" type="text/javascript"></script>
<script src="/shared/validation.js" type="text/javascript"></script>
<script src="/shared/provisioning.js" type="text/javascript"></script>
<script src="/shared/helpers.js" type="text/javascript"></script>
<script src="/pages/page_helpers.js" type="text/javascript"></script>
Expand Down
4 changes: 2 additions & 2 deletions scripts/compress.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ cp templates.js $BUILD_PATH/templates.js
cd ../..

# produce the dialog js
cat lib/jquery-1.6.2.min.js lib/winchan.js lib/underscore-min.js lib/vepbundle.js lib/ejs.js shared/browserid.js lib/hub.js lib/dom-jquery.js lib/module.js shared/javascript-extensions.js shared/mediator.js shared/class.js shared/storage.js $BUILD_PATH/templates.js shared/renderer.js shared/error-display.js shared/screens.js shared/tooltip.js shared/validation.js shared/network.js shared/user.js shared/error-messages.js shared/browser-support.js shared/wait-messages.js shared/helpers.js shared/provisioning.js dialog/resources/internal_api.js dialog/resources/helpers.js dialog/resources/state_machine.js dialog/controllers/page.js dialog/controllers/code_check.js dialog/controllers/actions.js dialog/controllers/dialog.js dialog/controllers/authenticate.js dialog/controllers/forgotpassword.js dialog/controllers/checkregistration.js dialog/controllers/pickemail.js dialog/controllers/addemail.js dialog/controllers/required_email.js dialog/start.js > $BUILD_PATH/dialog.uncompressed.js
cat lib/jquery-1.6.2.min.js lib/winchan.js lib/underscore-min.js lib/vepbundle.js lib/ejs.js shared/browserid.js lib/hub.js lib/dom-jquery.js lib/module.js shared/javascript-extensions.js shared/mediator.js shared/class.js shared/storage.js $BUILD_PATH/templates.js shared/renderer.js shared/error-display.js shared/screens.js shared/tooltip.js shared/validation.js shared/network.js shared/provisioning.js shared/user.js shared/error-messages.js shared/browser-support.js shared/wait-messages.js shared/helpers.js dialog/resources/internal_api.js dialog/resources/helpers.js dialog/resources/state_machine.js dialog/controllers/page.js dialog/controllers/code_check.js dialog/controllers/actions.js dialog/controllers/dialog.js dialog/controllers/authenticate.js dialog/controllers/forgotpassword.js dialog/controllers/checkregistration.js dialog/controllers/pickemail.js dialog/controllers/addemail.js dialog/controllers/required_email.js dialog/start.js > $BUILD_PATH/dialog.uncompressed.js

# produce the dialog css
cat css/common.css dialog/css/popup.css dialog/css/m.css > $BUILD_PATH/dialog.uncompressed.css
Expand All @@ -67,7 +67,7 @@ echo '****Building BrowserID.org HTML, CSS, and JS****'
echo ''

#produce the main site js
cat lib/jquery-1.6.2.min.js lib/json2.js lib/underscore-min.js lib/ejs.js shared/javascript-extensions.js shared/browserid.js lib/dom-jquery.js $BUILD_PATH/templates.js shared/renderer.js shared/error-display.js shared/screens.js shared/error-messages.js shared/storage.js shared/network.js shared/user.js shared/tooltip.js shared/validation.js shared/provisioning.js shared/helpers.js pages/page_helpers.js pages/browserid.js pages/index.js pages/add_email_address.js pages/verify_email_address.js pages/forgot.js pages/manage_account.js pages/signin.js pages/signup.js > $BUILD_PATH/browserid.uncompressed.js
cat lib/jquery-1.6.2.min.js lib/json2.js lib/underscore-min.js lib/ejs.js shared/javascript-extensions.js shared/browserid.js lib/dom-jquery.js $BUILD_PATH/templates.js shared/renderer.js shared/error-display.js shared/screens.js shared/error-messages.js shared/storage.js shared/network.js shared/provisioning.js shared/user.js shared/tooltip.js shared/validation.js shared/helpers.js pages/page_helpers.js pages/browserid.js pages/index.js pages/add_email_address.js pages/verify_email_address.js pages/forgot.js pages/manage_account.js pages/signin.js pages/signup.js > $BUILD_PATH/browserid.uncompressed.js

# produce the main site css
cat css/common.css css/style.css css/m.css > $BUILD_PATH/browserid.uncompressed.css
Expand Down

0 comments on commit 169b49b

Please sign in to comment.