Merge branch 'master' into FLUID-4912

fluid-project · Feb 4, 2013 · 8d3e66a · 8d3e66a
2 parents f027442 + b01b066
commit 8d3e66a
Show file tree

Hide file tree

Showing 4 changed files with 387 additions and 383 deletions.
diff --git a/src/webapp/framework/core/js/Fluid.js b/src/webapp/framework/core/js/Fluid.js
@@ -1423,7 +1423,7 @@ var fluid = fluid || fluid_1_5;
      */
     fluid.emptySubcomponent = function (options) {
         var that = {};
-        options = $.makeArray(options);
+        options = fluid.makeArray(options);
         for (var i = 0; i < options.length; ++i) {
             that[options[i]] = fluid.identity;
         }

diff --git a/src/webapp/framework/core/js/FluidIoC.js b/src/webapp/framework/core/js/FluidIoC.js
@@ -1156,8 +1156,6 @@ outer:  for (var i = 0; i < exist.length; ++i) {
 
     fluid.staticEnvironment = fluid.typeTag("fluid.staticEnvironment");
 
-    fluid.staticEnvironment.environmentClass = fluid.typeTag("fluid.browser");
-
     fluid.globalThreadLocal = fluid.threadLocal(function() {
         return fluid.typeTag("fluid.dynamicEnvironment");
     });

diff --git a/src/webapp/framework/enhancement/js/ProgressiveEnhancement.js b/src/webapp/framework/enhancement/js/ProgressiveEnhancement.js
@@ -21,7 +21,7 @@ var fluid_1_5 = fluid_1_5 || {};
 
 (function ($, fluid) {
 
-    if (typeof(window) !== "undefined") {
+    if (typeof(window) !== "undefined" && window.document) {
         fluid.registerNamespace("fluid.browser");
 
         fluid.browser.binaryXHR = function () {