Merge branch 'buildupdate-755254'

mozilla · Sep 10, 2012 · d2aab40 · d2aab40
2 parents 0b278a3 + 221cdf2
commit d2aab40
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 28 deletions.
diff --git a/lib/demo/index.js b/lib/demo/index.js
@@ -23,8 +23,6 @@ define(function(require, exports, module) {
   require('gcli/commands/pref_list').startup();
   require('gcli/commands/intro').startup();
 
-  require('test/commands/test').startup();
-
   require('demo/commands/basic').startup();
   require('demo/commands/bugs').startup();
   require('demo/commands/demo').startup();

diff --git a/lib/gcli/promise.js b/lib/gcli/promise.js
@@ -1,27 +1,20 @@
-/* vim:set ts=2 sw=2 sts=2 expandtab */
-/*jshint undef: true es5: true node: true browser: true devel: true
-         forin: true latedef: false */
-/*global define: true, Cu: true, __URI__: true */
-;(function(id, factory) { // Module boilerplate :(
-  if (typeof(define) === 'function') { // RequireJS
-    define(factory);
-  } else if (typeof(require) === 'function') { // CommonJS
-    factory.call(this, require, exports, module);
-  } else if (String(this).indexOf('BackstagePass') >= 0) { // JSM
-    this[factory.name] = {};
-    factory(function require(uri) {
-      var imports = {};
-      this['Components'].utils.import(uri, imports);
-      return imports;
-    }, this[factory.name], { uri: __URI__, id: id });
-    this.EXPORTED_SYMBOLS = [factory.name];
-  } else {  // Browser or alike
-    var globals = this;
-    factory(function require(id) {
-      return globals[id];
-    }, (globals[id] = {}), { uri: document.location.href + '#' + id, id: id });
-  }
-}).call(this, 'promise/core', function Promise(require, exports, module) {
+/*
+ * Copyright 2012, Mozilla Foundation and contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+define(function(require, exports, module) {
 
 'use strict';
 

diff --git a/lib/gclitest/index.js b/lib/gclitest/index.js
@@ -20,6 +20,8 @@ define(function(require, exports, module) {
   var settings = require('gcli/settings');
   var Display = require('gcli/ui/display').Display;
 
+  require('test/commands/test').startup();
+
   // A minimum fake dom to get us through the JS tests
   var fakeWindow = {
     isFake: true,

diff --git a/lib/server/commands/standard.js b/lib/server/commands/standard.js
@@ -59,7 +59,7 @@ exports.buildStandard = function() {
     source: {
       project: project,
       // This list of dependencies should reflect index.html
-      require: [ 'gcli/index', 'demo/index', 'gclitest/index' ]
+      require: [ 'gcli/index', 'demo/index' ]
     },
     filter: copy.filter.moduleDefines,
     dest: sources
@@ -113,5 +113,5 @@ exports.buildStandard = function() {
 function tweakIndex(data) {
   return data
       .replace(/scripts\/require.js/, 'gcli-uncompressed.js')
-      .replace(/\s*require\([^;]*;\n/, '');
+      .replace(/\s*requirejs.config\([^;]*;\n/, '');
 }