From ef61db9cbdd031fe04ce5e68d1225d95c283108d Mon Sep 17 00:00:00 2001 From: mkwiser Date: Thu, 16 Oct 2014 23:33:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dsvg=E6=B8=B2=E6=9F=93?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/editor/controller/initRender.js | 4 ++-- src/ttf/ttf2svg.js | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/editor/controller/initRender.js b/src/editor/controller/initRender.js index bcb478c..9fd3c07 100644 --- a/src/editor/controller/initRender.js +++ b/src/editor/controller/initRender.js @@ -196,7 +196,7 @@ define( } // 放大 - if (e.keyCode == 187 && e.ctrlKey) { + if (e.keyCode == 187 && (e.ctrlKey || e.altKey)) { e.originEvent.stopPropagation(); e.originEvent.preventDefault(); var size = render.getSize(); @@ -206,7 +206,7 @@ define( }); } // 缩小 - else if (e.keyCode == 189 && e.ctrlKey) { + else if (e.keyCode == 189 && (e.ctrlKey || e.altKey)) { e.originEvent.stopPropagation(); e.originEvent.preventDefault(); var size = render.getSize(); diff --git a/src/ttf/ttf2svg.js b/src/ttf/ttf2svg.js index 92ceb7e..1e0a010 100644 --- a/src/ttf/ttf2svg.js +++ b/src/ttf/ttf2svg.js @@ -50,7 +50,10 @@ define( unicode = [unicode]; } return unicode.map(function(u) { - return '&#x' + u.toString(16) + ';'; + if (u < 0x20) { + return ''; + } + return u >= 0x20 && u <= 255 ? String.fromCharCode(u).toLowerCase() : '&#x' + u.toString(16) + ';'; }).join(''); }