Merge remote-tracking branch 'upstream/master'

2012-07-12 16:45:21 +08:00 · 2012-07-12 16:45:21 +08:00 · 3088de6b6e
commit 3088de6b6e
parent 45fb395d38 4d0b478756
1 changed files with 9 additions and 7 deletions
--- a/src/fonts.js
+++ b/src/fonts.js
@ -2773,6 +2773,7 @@ var Font = (function FontClosure() {
            }
          }
          for (var index in newGlyphUnicodes) {
+            if (newGlyphUnicodes.hasOwnProperty(index)) {
              var unicode = newGlyphUnicodes[index];
              if (reverseMap[unicode]) {
                // avoiding assigning to the same unicode
@ -2782,6 +2783,7 @@ var Font = (function FontClosure() {
              glyphs[index].unicode = unicode;
              reverseMap[unicode] = index;
            }
+          }
          this.useToFontChar = true;
        }