fixes #526 - Material icons not shown in Android 4

scriptPilot · May 17, 2017 · 2751772 · 2751772
1 parent 9524898
commit 2751772
Show file tree

Hide file tree

Showing 28 changed files with 2,069 additions and 1,121 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,10 @@
 
 ## Next version
 
+### Bug-fixes
+
+- [x] [#526 - Material icons not shown in Android 4](https://github.com/scriptPilot/app-framework/issues/526)
+
 ### Improvements
 
 - [x] [#539 - Create script to update Material Icons fonts automatically](https://github.com/scriptPilot/app-framework/issues/539)

diff --git a/DOCUMENTATION.md b/DOCUMENTATION.md
@@ -27,6 +27,7 @@ The check boxes indicate articles which are already reworked.
   - [x] [Global data object](docs/data-object.md)
   - [x] [sortObject function](docs/sort-object.md)
   - [x] [Images](docs/images.md)
+  - [ ] [Icon fonts](docs/icon-fonts.md)
   - [ ] [Modules and scripts](docs/modules-and-scripts.md)
   - [ ] [Cordova plugins](docs/cordova-plugins.md)
   - [ ] [Firebase backend](docs/firebase.md)

diff --git a/client/app.js b/client/app.js
@@ -362,6 +362,9 @@ mixins.checkNPMupdates = {
   }
 }
 mixins.initWorkarounds = {
+  data: {
+    materialCodepoints: null
+  },
   beforeCreate: function () {
     require('./workarounds.css')
     // Actions not show/hide properly
@@ -375,6 +378,12 @@ mixins.initWorkarounds = {
     window.Dom7(document).on('page:init', (e) => {
       window.Dom7(e.target).find('.login-screen.modal-out').hide()
     })
+  },
+  created: function () {
+    // Materical Icons not shown in older browsers / android versions
+    if (process.env.FONT_MATERIAL) {
+      this.materialCodepoints = require('./material-codepoints.json')
+    }
   }
 }
 mixins.manageGlobalDataObject = {