Fixes twbs#9925: convert font data to base64, fixing 0xefbfbd (Unicod…

…e Replacement Character) chars in customizer fonts. Merges twbs#9982
20111564 · Oct 10, 2013 · aad7083 · aad7083
1 parent 58a47b6
commit aad7083
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -3,6 +3,7 @@
 module.exports = function(grunt) {
   "use strict";
 
+  var btoa = require('btoa')
   // Project configuration.
   grunt.initConfig({
 
@@ -209,7 +210,8 @@ module.exports = function(grunt) {
           return type == 'fonts' ? true : new RegExp('\\.' + type + '$').test(path)
         })
         .forEach(function (path) {
-          return files[path] = fs.readFileSync(type + '/' + path, 'utf8')
+          return type == 'fonts' ? files[path] = btoa(fs.readFileSync(type + '/' + path)) :
+              files[path] = fs.readFileSync(type + '/' + path, 'utf8')
         })
       return 'var __' + type + ' = ' + JSON.stringify(files) + '\n'
     }

diff --git a/docs-assets/js/customizer.js b/docs-assets/js/customizer.js
@@ -129,7 +129,7 @@ window.onload = function () { // wait for load in a dumb way because B-0
     if (fonts) {
       var fontsFolder = zip.folder('fonts')
       for (var fileName in fonts) {
-        fontsFolder.file(fileName, fonts[fileName])
+        fontsFolder.file(fileName, fonts[fileName], {base64: true})
       }
     }
 

diff --git a/docs-assets/js/raw-files.js b/docs-assets/js/raw-files.js
diff --git a/package.json b/package.json
@@ -20,7 +20,8 @@
     }
   ]
   , "devDependencies": {
-      "grunt": "~0.4.1"
+      "btoa": "~1.1.1"
+    , "grunt": "~0.4.1"
     , "grunt-contrib-clean": "~0.5.0"
     , "grunt-contrib-concat": "~0.3.0"
     , "grunt-contrib-connect": "~0.5.0"