Bug 1229004 - Rename the libs directory to vendor in browser/extensions/loop/standalone/content. r=dmose
authorMark Banner <standard8@mozilla.com>
Tue, 01 Dec 2015 14:47:50 +0000
changeset 312922 17edd54329657f8783cb7bddd18b86297087fe5e
parent 312921 ade2734419a41fc0d881c34fa255b5c828c4b873
child 312923 c16ed5642dd58b274b81d9598d45b0ebb8f0646b
child 312936 b3e4e51c1d4984a28fb8e522271191d18a8b725f
child 312939 1650e55899e6d0ebb7c7e6dd530e2f0424c6ae63
child 313089 eb83cf3ba51771101b8f8b952fbc23dfe0b84f41
child 313090 d821c903bd2b7d34a5990fabca6a7cc398dab4e6
child 313150 0c49549b534f434856a4c5a84a134389fe2e7336
child 313272 13022e404bfdb1f10cce0f70c5d712a84180efcf
child 313532 9c13241c055fe59c425ce09a0ad7db96c5699ea0
push id8015
push usermconley@mozilla.com
push dateTue, 01 Dec 2015 16:42:47 +0000
reviewersdmose
bugs1229004
milestone45.0a1
Bug 1229004 - Rename the libs directory to vendor in browser/extensions/loop/standalone/content. r=dmose
.eslintignore
browser/extensions/loop/standalone/content/index.html
browser/extensions/loop/standalone/content/libs/l10n-gaia-02ca67948fe8.js
browser/extensions/loop/standalone/content/libs/l10n-gaia-upstream.txt
browser/extensions/loop/standalone/content/vendor/l10n-gaia-02ca67948fe8.js
browser/extensions/loop/standalone/content/vendor/l10n-gaia-upstream.txt
browser/extensions/loop/test/karma/karma.coverage.shared_standalone.js
browser/extensions/loop/test/shared/index.html
browser/extensions/loop/test/standalone/index.html
--- a/.eslintignore
+++ b/.eslintignore
@@ -89,17 +89,17 @@ browser/extensions/loop/content/modules/
 browser/extensions/loop/content/modules/MozLoopAPI.jsm
 # Need to fix the configuration for this.
 browser/extensions/loop/bootstrap.js
 # Need to drop the preprocessing (bug 1212428)
 browser/extensions/loop/content/preferences/prefs.js
 # Libs we don't need to check
 browser/extensions/loop/content/panels/vendor
 browser/extensions/loop/content/shared/vendor
-browser/extensions/loop/standalone/content/libs
+browser/extensions/loop/standalone/content/vendor
 # Libs we don't need to check
 browser/extensions/loop/test/shared/vendor
 # Coverage files
 browser/extensions/loop/test/coverage
 # These are generated react files that we don't need to check
 browser/extensions/loop/content/panels/js/conversation.js
 browser/extensions/loop/content/panels/js/conversationViews.js
 browser/extensions/loop/content/panels/js/panel.js
--- a/browser/extensions/loop/standalone/content/index.html
+++ b/browser/extensions/loop/standalone/content/index.html
@@ -211,17 +211,17 @@
     <!-- We'd like to bundle/minify this at some point, but we need to work
          out how to configure webpack to run this in a module container
          rather than directly in the global scope. -->
 
     <!-- Note that as long as the various closures in the files loaded by
          webppEntryPoint.js take navigator.mozL10n as an argument, this
          JS must run to completion before that file loads, so this one must be
          loaded synchronously first -->
-    <script type="text/javascript" src="libs/l10n-gaia-02ca67948fe8.js">
+    <script type="text/javascript" src="vendor/l10n-gaia-02ca67948fe8.js">
     </script>
 
     <!-- Note that for 'make dist', webappEntryPoint.js is replaced by
          the standalone.js bundle -->
     <script type="text/javascript" src="webappEntryPoint.js"></script>
 
     <script>
       window.addEventListener("localized", function() {
rename from browser/extensions/loop/standalone/content/libs/l10n-gaia-02ca67948fe8.js
rename to browser/extensions/loop/standalone/content/vendor/l10n-gaia-02ca67948fe8.js
rename from browser/extensions/loop/standalone/content/libs/l10n-gaia-upstream.txt
rename to browser/extensions/loop/standalone/content/vendor/l10n-gaia-upstream.txt
--- a/browser/extensions/loop/test/karma/karma.coverage.shared_standalone.js
+++ b/browser/extensions/loop/test/karma/karma.coverage.shared_standalone.js
@@ -5,17 +5,17 @@
 
 module.exports = function(config) {
   "use strict";
 
   var baseConfig = require("./karma.conf.base.js")(config);
 
   // List of files / patterns to load in the browser.
   baseConfig.files = baseConfig.files.concat([
-    "standalone/content/libs/l10n-gaia-02ca67948fe8.js",
+    "standalone/content/vendor/l10n-gaia-02ca67948fe8.js",
     "content/shared/vendor/lodash-3.9.3.js",
     "content/shared/vendor/backbone-1.2.1.js",
     "content/shared/vendor/react-0.13.3.js",
     "content/shared/vendor/classnames-2.2.0.js",
     "content/shared/vendor/sdk.js",
     "test/shared/vendor/*.js",
     "test/shared/loop_mocha_utils.js",
     "test/karma/head.js", // Add test fixture container
--- a/browser/extensions/loop/test/shared/index.html
+++ b/browser/extensions/loop/test/shared/index.html
@@ -19,17 +19,17 @@
   <script>
     LoopMochaUtils.trapErrors();
   </script>
 
   <!-- libs -->
   <script src="../../content/shared/vendor/react-0.13.3.js"></script>
   <script src="../../content/shared/vendor/classnames-2.2.0.js"></script>
   <script src="../../content/shared/vendor/backbone-1.2.1.js"></script>
-  <script src="../../standalone/content/libs/l10n-gaia-02ca67948fe8.js"></script>
+  <script src="../../standalone/content/vendor/l10n-gaia-02ca67948fe8.js"></script>
 
   <!-- test dependencies -->
   <script src="vendor/mocha-2.2.5.js"></script>
   <script src="vendor/chai-3.0.0.js"></script>
   <script src="vendor/chai-as-promised-5.1.0.js"></script>
   <script src="vendor/sinon-1.16.1.js"></script>
   <script>
     /*global chai, mocha */
--- a/browser/extensions/loop/test/standalone/index.html
+++ b/browser/extensions/loop/test/standalone/index.html
@@ -19,17 +19,17 @@
   <script>
     LoopMochaUtils.trapErrors();
   </script>
 
   <!-- libs -->
   <script src="../../content/shared/vendor/react-0.13.3.js"></script>
   <script src="../../content/shared/vendor/classnames-2.2.0.js"></script>
   <script src="../../content/shared/vendor/backbone-1.2.1.js"></script>
-  <script src="../../standalone/content/libs/l10n-gaia-02ca67948fe8.js"></script>
+  <script src="../../standalone/content/vendor/l10n-gaia-02ca67948fe8.js"></script>
   <!-- test dependencies -->
   <script src="../shared/vendor/mocha-2.2.5.js"></script>
   <script src="../shared/vendor/chai-3.0.0.js"></script>
   <script src="../shared/vendor/sinon-1.16.1.js"></script>
   <script src="../shared/sdk_mock.js"></script>
   <script>
     chai.config.includeStack = true;
     mocha.setup({ui: 'bdd', timeout: 10000});