Merge pull request #36 from gaia-components/bug1148073

Bug 1148073 - [gaia-icons] Check for documentElement before loading
fxos-components · Mar 26, 2015 · f82a512 · f82a512
2 parents 0457887 + 5203118
commit f82a512
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "gaia-icons",
-  "version": "0.7.10",
+  "version": "0.7.11",
   "homepage": "https://github.com/wilsonpage/gaia-icons",
   "authors": [
     "Wilson Page <wilsonpage@me.com>"

diff --git a/gaia-icons.js b/gaia-icons.js
@@ -9,14 +9,19 @@ var base = window.GAIA_ICONS_BASE_URL
   || window.COMPONENTS_BASE_URL
   || 'bower_components/';
 
-// Load it if it's not already loaded
-if (!isLoaded()) { load(base + 'gaia-icons/gaia-icons.css'); }
+if (!document.documentElement) {
+  window.addEventListener('load', load);
+} else {
+  load();
+}
+
+function load() {
+  if (isLoaded()) { return; }
 
-function load(href) {
   var link = document.createElement('link');
   link.rel = 'stylesheet';
   link.type = 'text/css';
-  link.href = href;
+  link.href = base + 'gaia-icons/gaia-icons.css';
   document.head.appendChild(link);
   exports.loaded = true;
 }

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gaia-icons",
-  "version": "0.7.10",
+  "version": "0.7.11",
   "main": "gaia-icons.js",
   "scripts": {
     "gh-pages": "git push upstream master:gh-pages"