From 169b49ba42c4f2bafa47f83d0869436796e5e7cb Mon Sep 17 00:00:00 2001
From: Lloyd Hilaiel <lloyd@hilaiel.com>
Date: Tue, 20 Dec 2011 11:07:34 -0700
Subject: [PATCH] user.js now must be evaluated after provisioning.js, reorder
includes.
---
resources/static/test/index.html | 2 +-
resources/views/layout.ejs | 2 +-
scripts/compress.sh | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/resources/static/test/index.html b/resources/static/test/index.html
index 50386e33e..d209296ed 100644
--- a/resources/static/test/index.html
+++ b/resources/static/test/index.html
@@ -101,10 +101,10 @@
<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>
diff --git a/resources/views/layout.ejs b/resources/views/layout.ejs
index 3f0724e05..fbfa792ae 100644
--- a/resources/views/layout.ejs
+++ b/resources/views/layout.ejs
@@ -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>
diff --git a/scripts/compress.sh b/scripts/compress.sh
index e566890d8..b4d8e22dd 100755
--- a/scripts/compress.sh
+++ b/scripts/compress.sh
@@ -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
@@ -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
--
GitLab