Bug 1044419 Change the Loop Standalone client to use the same version of the sdk as the desktop. r=nperriault

--HG--
rename : browser/components/loop/content/libs/sdk-content/css/ot.css => browser/components/loop/content/shared/libs/sdk-content/css/ot.css
rename : browser/components/loop/content/libs/sdk-content/images/rtc/access-denied-chrome.png => browser/components/loop/content/shared/libs/sdk-content/images/rtc/access-denied-chrome.png
rename : browser/components/loop/content/libs/sdk-content/images/rtc/access-denied-copy-firefox.png => browser/components/loop/content/shared/libs/sdk-content/images/rtc/access-denied-copy-firefox.png
rename : browser/components/loop/content/libs/sdk-content/images/rtc/access-denied-firefox.png => browser/components/loop/content/shared/libs/sdk-content/images/rtc/access-denied-firefox.png
rename : browser/components/loop/content/libs/sdk-content/images/rtc/access-predenied-chrome.png => browser/components/loop/content/shared/libs/sdk-content/images/rtc/access-predenied-chrome.png
rename : browser/components/loop/content/libs/sdk-content/images/rtc/access-prompt-chrome.png => browser/components/loop/content/shared/libs/sdk-content/images/rtc/access-prompt-chrome.png
rename : browser/components/loop/content/libs/sdk-content/images/rtc/audioonly-publisher.png => browser/components/loop/content/shared/libs/sdk-content/images/rtc/audioonly-publisher.png
rename : browser/components/loop/content/libs/sdk-content/images/rtc/audioonly-subscriber.png => browser/components/loop/content/shared/libs/sdk-content/images/rtc/audioonly-subscriber.png
rename : browser/components/loop/content/libs/sdk-content/images/rtc/buttons.png => browser/components/loop/content/shared/libs/sdk-content/images/rtc/buttons.png
rename : browser/components/loop/content/libs/sdk-content/images/rtc/loader.gif => browser/components/loop/content/shared/libs/sdk-content/images/rtc/loader.gif
rename : browser/components/loop/content/libs/sdk-content/images/rtc/mic-off.png => browser/components/loop/content/shared/libs/sdk-content/images/rtc/mic-off.png
rename : browser/components/loop/content/libs/sdk-content/images/rtc/mic-on.png => browser/components/loop/content/shared/libs/sdk-content/images/rtc/mic-on.png
rename : browser/components/loop/content/libs/sdk-content/images/rtc/speaker-off.png => browser/components/loop/content/shared/libs/sdk-content/images/rtc/speaker-off.png
rename : browser/components/loop/content/libs/sdk-content/images/rtc/speaker-on.png => browser/components/loop/content/shared/libs/sdk-content/images/rtc/speaker-on.png
rename : browser/components/loop/content/libs/sdk-content/js/dynamic_config.min.js => browser/components/loop/content/shared/libs/sdk-content/js/dynamic_config.min.js
rename : browser/components/loop/content/libs/sdk.js => browser/components/loop/content/shared/libs/sdk.js
This commit is contained in:
Mark Banner 2014-07-30 17:13:18 +01:00
parent 8e04e64ab7
commit cf796faeab
18 changed files with 25 additions and 17 deletions

View File

@ -53,19 +53,19 @@ browser.jar:
content/browser/loop/shared/sounds/Firefox-Long.ogg (content/shared/sounds/Firefox-Long.ogg)
# Partner SDK assets
content/browser/loop/libs/sdk.js (content/libs/sdk.js)
content/browser/loop/sdk-content/css/ot.css (content/libs/sdk-content/css/ot.css)
content/browser/loop/sdk-content/js/dynamic_config.min.js (content/libs/sdk-content/js/dynamic_config.min.js)
content/browser/loop/sdk-content/images/rtc/access-denied-chrome.png (content/libs/sdk-content/images/rtc/access-denied-chrome.png)
content/browser/loop/sdk-content/images/rtc/access-denied-copy-firefox.png (content/libs/sdk-content/images/rtc/access-denied-copy-firefox.png)
content/browser/loop/sdk-content/images/rtc/access-denied-firefox.png (content/libs/sdk-content/images/rtc/access-denied-firefox.png)
content/browser/loop/sdk-content/images/rtc/access-predenied-chrome.png (content/libs/sdk-content/images/rtc/access-predenied-chrome.png)
content/browser/loop/sdk-content/images/rtc/access-prompt-chrome.png (content/libs/sdk-content/images/rtc/access-prompt-chrome.png)
content/browser/loop/sdk-content/images/rtc/audioonly-publisher.png (content/libs/sdk-content/images/rtc/audioonly-publisher.png)
content/browser/loop/sdk-content/images/rtc/audioonly-subscriber.png (content/libs/sdk-content/images/rtc/audioonly-subscriber.png)
content/browser/loop/sdk-content/images/rtc/buttons.png (content/libs/sdk-content/images/rtc/buttons.png)
content/browser/loop/sdk-content/images/rtc/loader.gif (content/libs/sdk-content/images/rtc/loader.gif)
content/browser/loop/sdk-content/images/rtc/mic-off.png (content/libs/sdk-content/images/rtc/mic-off.png)
content/browser/loop/sdk-content/images/rtc/mic-on.png (content/libs/sdk-content/images/rtc/mic-on.png)
content/browser/loop/sdk-content/images/rtc/speaker-off.png (content/libs/sdk-content/images/rtc/speaker-off.png)
content/browser/loop/sdk-content/images/rtc/speaker-on.png (content/libs/sdk-content/images/rtc/speaker-on.png)
content/browser/loop/libs/sdk.js (content/shared/libs/sdk.js)
content/browser/loop/sdk-content/css/ot.css (content/shared/libs/sdk-content/css/ot.css)
content/browser/loop/sdk-content/js/dynamic_config.min.js (content/shared/libs/sdk-content/js/dynamic_config.min.js)
content/browser/loop/sdk-content/images/rtc/access-denied-chrome.png (content/shared/libs/sdk-content/images/rtc/access-denied-chrome.png)
content/browser/loop/sdk-content/images/rtc/access-denied-copy-firefox.png (content/shared/libs/sdk-content/images/rtc/access-denied-copy-firefox.png)
content/browser/loop/sdk-content/images/rtc/access-denied-firefox.png (content/shared/libs/sdk-content/images/rtc/access-denied-firefox.png)
content/browser/loop/sdk-content/images/rtc/access-predenied-chrome.png (content/shared/libs/sdk-content/images/rtc/access-predenied-chrome.png)
content/browser/loop/sdk-content/images/rtc/access-prompt-chrome.png (content/shared/libs/sdk-content/images/rtc/access-prompt-chrome.png)
content/browser/loop/sdk-content/images/rtc/audioonly-publisher.png (content/shared/libs/sdk-content/images/rtc/audioonly-publisher.png)
content/browser/loop/sdk-content/images/rtc/audioonly-subscriber.png (content/shared/libs/sdk-content/images/rtc/audioonly-subscriber.png)
content/browser/loop/sdk-content/images/rtc/buttons.png (content/shared/libs/sdk-content/images/rtc/buttons.png)
content/browser/loop/sdk-content/images/rtc/loader.gif (content/shared/libs/sdk-content/images/rtc/loader.gif)
content/browser/loop/sdk-content/images/rtc/mic-off.png (content/shared/libs/sdk-content/images/rtc/mic-off.png)
content/browser/loop/sdk-content/images/rtc/mic-on.png (content/shared/libs/sdk-content/images/rtc/mic-on.png)
content/browser/loop/sdk-content/images/rtc/speaker-off.png (content/shared/libs/sdk-content/images/rtc/speaker-off.png)
content/browser/loop/sdk-content/images/rtc/speaker-on.png (content/shared/libs/sdk-content/images/rtc/speaker-on.png)

View File

@ -22,7 +22,15 @@
<div id="main"></div>
<!-- libs -->
<script src="https://static.opentok.com/webrtc/v2.2/js/opentok.min.js"></script>
<script>
window.OTProperties = {
cdnURL: 'shared/libs/',
};
window.OTProperties.assetURL = window.OTProperties.cdnURL + 'sdk-content/';
window.OTProperties.configURL = window.OTProperties.assetURL + 'js/dynamic_config.min.js';
window.OTProperties.cssURL = window.OTProperties.assetURL + 'css/ot.css';
</script>
<script type="text/javascript" src="shared/libs/sdk.js"></script>
<script type="text/javascript" src="libs/webl10n-20130617.js"></script>
<script type="text/javascript" src="shared/libs/react-0.10.0.js"></script>
<script type="text/javascript" src="shared/libs/jquery-2.1.0.js"></script>