Skip to content

Commit

Permalink
Merge pull request #616 from bstell/master
Browse files Browse the repository at this point in the history
Minor stuff.
  • Loading branch information
bstell committed Apr 21, 2015
2 parents eda6b93 + 9112fbb commit afc05d2
Showing 1 changed file with 8 additions and 5 deletions.
13 changes: 8 additions & 5 deletions run_time/src/gae_server/www/js/tachyfont/tachyfont.js
Original file line number Diff line number Diff line change
Expand Up @@ -90,10 +90,13 @@ if (goog.DEBUG) {
*/
tachyfont.buildDemo = false;

var persistDataStr = tachyfont.uri.getParameterValue('TachyFontPersistData') || '';
if (persistDataStr.toLowerCase() == "false") {
tachyfont.persistData = false;
}
var persistDataStr =
tachyfont.uri.getParameterValue('TachyFontPersistData') || '';
// The following code implements this logic:
// if (persistDataStr.toLowerCase() == 'false') {
// tachyfont.persistData = false;
// }
tachyfont.persistData = persistDataStr.toLowerCase() != 'false';
};
}

Expand Down Expand Up @@ -240,8 +243,8 @@ tachyfont.loadFonts = function(familyName, fontsInfo, opt_params) {
then(function(arrayBaseData) {
var allCssSet = [];
for (var i = 0; i < tachyFonts.length; i++) {
var loadedBase = arrayBaseData[i];
var incrfont = tachyFonts[i].incrfont;
var loadedBase = arrayBaseData[i];
// If not persisted then need to wait for DOMContentLoaded to
// set the font.
if (!incrfont.alreadyPersisted) {
Expand Down

0 comments on commit afc05d2

Please sign in to comment.