Move the check for css to be loaded out of a string into code

miriam · Dec 13, 2013 · 5750dcd · 5750dcd
1 parent 4ab6f8e
commit 5750dcd
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/packages/webapp/package.js b/packages/webapp/package.js
@@ -9,6 +9,7 @@ Npm.depends({connect: "2.9.0",
 
 Package.on_use(function (api) {
   api.use(['logging', 'underscore', 'routepolicy'], 'server');
+  api.use(['underscore'], 'client');
   api.use(['application-configuration', 'follower-livedata'], {
     unordered: true
   });
@@ -19,5 +20,6 @@ Package.on_use(function (api) {
   // loaded after webapp.
   api.export(['WebApp', 'main', 'WebAppInternals'], 'server');
   api.add_files('webapp_server.js', 'server');
+  api.add_files('webapp_client.js', 'client');
   api.add_files('css_detect.css', 'client');
 });
diff --git a/packages/webapp/webapp_client.js b/packages/webapp/webapp_client.js
@@ -0,0 +1,7 @@
+Meteor._isCssLoaded = function () {
+  return _.find(document.styleSheets, function (sheet) {
+    return _.find(sheet.cssRules, function (rule) {
+      return rule.selectorText === '._meteor_detect_css';
+    });
+  });
+};
diff --git a/packages/webapp/webapp_server.js b/packages/webapp/webapp_server.js
@@ -22,11 +22,7 @@ var bundledJsCssPrefix;
 
 var RELOAD_SAFETYBELT = "\n" +
       "if (typeof Meteor === 'undefined' || \n" +
-      "    ! _.find(document.styleSheets, function (sheet) { \n" +
-      "      return _.find(sheet.cssRules, function (rule) { \n" +
-      "         return rule.selectorText === '._meteor_detect_css'; \n" +
-      "      }); \n" +
-      "    })) \n" +
+      "    ! Meteor._isCssLoaded()) \n" +
       "  document.location.reload(); \n";