Merge pull request #29 from justindarc/bug1148123

Bug 1148123 - [gaia-header] Update gaia-icons dependency to resolve Bug ...
fxos-components · Mar 26, 2015 · 7ae28f9 · 7ae28f9
2 parents 64da8f8 + 61eb7d9
commit 7ae28f9
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "gaia-header",
-  "version": "0.8.0",
+  "version": "0.8.1",
   "homepage": "https://github.com/gaia-components/gaia-header",
   "authors": [
     "Wilson Page <wilsonpage@me.com>"
@@ -18,7 +18,7 @@
     "README.md"
   ],
   "dependencies": {
-    "gaia-icons": "gaia-components/gaia-icons#~0.7.0",
+    "gaia-icons": "gaia-components/gaia-icons#~0.7.11",
     "gaia-component": "gaia-components/gaia-component#~0.3.0",
     "font-fit": "gaia-components/font-fit#~0.3.0"
   },

diff --git a/dist/gaia-header.js b/dist/gaia-header.js
@@ -531,14 +531,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-header",
-  "version": "0.7.1",
+  "version": "0.8.1",
   "homepage": "https://github.com/gaia-components/gaia-header",
   "license": "MIT",
   "main": "gaia-header.js",