removed unsafe references to local_settings.js

thatcher · Feb 2, 2010 · 74c27c4 · 74c27c4
1 parent b4bfb5d
commit 74c27c4
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 13 deletions.
diff --git a/README.Refactor.txt b/README.Refactor.txt
@@ -69,13 +69,7 @@
  port is also being widely used, and we hope to integrate into the main branch 
  or as a github plugin.
 
- If your platform isn't supported:
-
- * try to use the same command with a different platform
-     > ant ...
-     > make ....
-     > rake ...
- * If your platform isn't supported please volunteer to provide one if you can!
+
 
 
 

diff --git a/src/env/johnson/placeholder.txt b/src/env/johnson/placeholder.txt
diff --git a/test/specs/env/spec.js b/test/specs/env/spec.js
@@ -37,7 +37,11 @@ _load('dist/platform/core.js');
 _load('dist/platform/rhino.js');
 _load('dist/console.js');
 _load('src/common/__extend__.js');
-_load('local_settings.js');
+try{
+    _load('local_settings.js');
+}catch(e){
+    _load('settings.js');
+}
 
 module('rhino');
 

diff --git a/test/specs/event/spec.js b/test/specs/event/spec.js
@@ -17,7 +17,6 @@ try{
     _load = _start = function(){};
 }
 
-
 QUnit.log = function(result, message){
     if(console)console.log('(' + (_count++) + ')[' + 
         ((!!result) ? 'PASS' : 'FAIL') + '] ' + message);

diff --git a/test/specs/html/spec.js b/test/specs/html/spec.js
@@ -17,7 +17,6 @@ try{
     _load = _start = function(){};
 }
 
-
 QUnit.log = function(result, message){
     if(console)console.log('(' + (_count++) + ')[' + 
         ((!!result) ? 'PASS' : 'FAIL') + '] ' + message);

diff --git a/test/specs/parser/spec.js b/test/specs/parser/spec.js
@@ -17,7 +17,6 @@ try{
     _load = _start = function(){};
 }
 
-
 QUnit.log = function(result, message){
     if(console)console.log('(' + (_count++) + ')[' + 
         ((!!result) ? 'PASS' : 'FAIL') + '] ' + message);

diff --git a/test/specs/window/spec.js b/test/specs/window/spec.js
@@ -24,7 +24,12 @@ try{
     _load('dist/parser.js');
     _load('dist/xhr.js');
     _load('dist/window.js');
-    _load('local_settings.js');
+
+    try{
+        _load('local_settings.js');
+    }catch(e){
+        _load('settings.js');
+    }
 
     //mock the window and document in envjs
     new Window(__this__, __this__);

diff --git a/test/specs/xhr/spec.js b/test/specs/xhr/spec.js
@@ -42,7 +42,11 @@ _load('dist/html.js');
 _load('dist/timer.js');
 _load('dist/parser.js');
 _load('dist/xhr.js');
-_load('local_settings.js');
+try{
+    _load('local_settings.js');
+}catch(e){
+    _load('settings.js');
+}
 
 module('xhr');