Bug 1173582-no longer need to ship/load SDK CSS & related assets, r=Standard8
authorDan Mosedale <dmose@meer.net>
Fri, 26 Jun 2015 17:40:35 -0700
changeset 281166 0c42f28d884daa0945e4e2a6de4c58b4f93a2d07
parent 281165 0f598226e3faa8f5c2c7f52d0e5b9ea56013009b
child 281167 b3f1aedcf9ba93825bc758684e722435cb0d296c
push id4932
push userjlund@mozilla.com
push dateMon, 10 Aug 2015 18:23:06 +0000
treeherdermozilla-beta@6dd5a4f5f745 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersStandard8
bugs1173582
milestone41.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1173582-no longer need to ship/load SDK CSS & related assets, r=Standard8
browser/components/loop/content/js/otconfig.js
browser/components/loop/jar.mn
browser/components/loop/standalone/content/index.html
browser/components/loop/ui/index.html
--- a/browser/components/loop/content/js/otconfig.js
+++ b/browser/components/loop/content/js/otconfig.js
@@ -2,9 +2,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 window.OTProperties = {
   cdnURL: "loop/"
 };
 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";
--- a/browser/components/loop/jar.mn
+++ b/browser/components/loop/jar.mn
@@ -113,23 +113,9 @@ browser.jar:
   content/browser/loop/shared/sounds/room-joined.ogg    (content/shared/sounds/room-joined.ogg)
   content/browser/loop/shared/sounds/room-joined-in.ogg (content/shared/sounds/room-joined-in.ogg)
   content/browser/loop/shared/sounds/room-left.ogg      (content/shared/sounds/room-left.ogg)
   content/browser/loop/shared/sounds/failure.ogg        (content/shared/sounds/failure.ogg)
   content/browser/loop/shared/sounds/message.ogg        (content/shared/sounds/message.ogg)
 
   # Partner SDK assets
   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)
--- a/browser/components/loop/standalone/content/index.html
+++ b/browser/components/loop/standalone/content/index.html
@@ -104,17 +104,16 @@
         window.MutationObserver = myMutationObserver;
       }
 
       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="js/multiplexGum.js"></script>
     <script type="text/javascript" src="shared/libs/sdk.js"></script>
     <script>
       // multiplexGum needs evaluation before sdk.js, but TBPlugin is not
       // defined until after sdk.js has been evaluated. This updates the
       // navigator object to reference TBPlugin if it was defined by sdk.js.
       if (!navigator.originalGum) {
--- a/browser/components/loop/ui/index.html
+++ b/browser/components/loop/ui/index.html
@@ -30,17 +30,16 @@
     <script src="fake-mozLoop.js"></script>
     <script src="fake-l10n.js"></script>
     <script>
       window.OTProperties = {
         cdnURL: '../content/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 src="../content/js/multiplexGum.js"></script>
     <script src="../content/shared/libs/sdk.js"></script>
     <script src="../content/shared/libs/react-0.12.2.js"></script>
     <script src="../content/shared/libs/jquery-2.1.4.js"></script>
     <script src="../content/shared/libs/lodash-2.4.1.js"></script>
     <script src="../content/shared/libs/backbone-1.1.2.js"></script>
     <script src="../content/shared/js/feedbackApiClient.js"></script>