From 9f9d3b793fc65274f022c6c282004e31c95c21e3 Mon Sep 17 00:00:00 2001 From: Shane Tomlinson <stomlinson@mozilla.com> Date: Wed, 25 Jan 2012 12:08:58 +0000 Subject: [PATCH] Make sure all dependencies are met for the communication_iframe. close #980 --- resources/views/communication_iframe.ejs | 4 ++++ scripts/compress.sh | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/resources/views/communication_iframe.ejs b/resources/views/communication_iframe.ejs index e8ea25450..5a1e2c07f 100644 --- a/resources/views/communication_iframe.ejs +++ b/resources/views/communication_iframe.ejs @@ -12,9 +12,13 @@ <script type="text/javascript" src="/lib/jschannel.js"></script> <script type="text/javascript" src="/lib/underscore-min.js"></script> <script type="text/javascript" src="/lib/vepbundle.js"></script> + <script type="text/javascript" src="/lib/hub.js"></script> <script type="text/javascript" src="/shared/javascript-extensions.js"></script> <script type="text/javascript" src="/shared/browserid.js"></script> + <script type="text/javascript" src="/shared/mediator.js"></script> + <script type="text/javascript" src="/shared/helpers.js"></script> <script type="text/javascript" src="/shared/storage.js"></script> + <script type="text/javascript" src="/shared/xhr.js"></script> <script type="text/javascript" src="/shared/network.js"></script> <script type="text/javascript" src="/shared/user.js"></script> <script type="text/javascript" src="/communication_iframe/start.js"></script> diff --git a/scripts/compress.sh b/scripts/compress.sh index bc3b60c25..ec54a2dd1 100755 --- a/scripts/compress.sh +++ b/scripts/compress.sh @@ -71,7 +71,7 @@ done cat css/common.css dialog/css/popup.css dialog/css/m.css > $BUILD_PATH/dialog.uncompressed.css # produce the non interactive frame js -cat lib/jquery-1.7.1.min.js lib/jschannel.js lib/winchan.js lib/underscore-min.js lib/vepbundle.js shared/javascript-extensions.js shared/browserid.js shared/storage.js shared/xhr.js shared/network.js shared/user.js communication_iframe/start.js > $BUILD_PATH/communication_iframe.uncompressed.js +cat lib/jquery-1.7.1.min.js lib/jschannel.js lib/winchan.js lib/underscore-min.js lib/vepbundle.js lib/hub.js shared/javascript-extensions.js shared/browserid.js shared/helpers.js shared/storage.js shared/xhr.js shared/network.js shared/user.js communication_iframe/start.js > $BUILD_PATH/communication_iframe.uncompressed.js echo '' echo '****Building BrowserID.org HTML, CSS, and JS****' -- GitLab