Return-Path: X-Original-To: apmail-incubator-callback-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-callback-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 614D99FB1 for ; Thu, 7 Jun 2012 20:40:45 +0000 (UTC) Received: (qmail 70923 invoked by uid 500); 7 Jun 2012 20:40:44 -0000 Delivered-To: apmail-incubator-callback-commits-archive@incubator.apache.org Received: (qmail 70819 invoked by uid 500); 7 Jun 2012 20:40:44 -0000 Mailing-List: contact callback-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: callback-dev@incubator.apache.org Delivered-To: mailing list callback-commits@incubator.apache.org Received: (qmail 70462 invoked by uid 99); 7 Jun 2012 20:40:44 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Jun 2012 20:40:44 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 0E17310AF5; Thu, 7 Jun 2012 20:40:44 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: timkim@apache.org To: callback-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [13/48] js commit: fixed able to read special characters Message-Id: <20120607204044.0E17310AF5@tyr.zones.apache.org> Date: Thu, 7 Jun 2012 20:40:44 +0000 (UTC) fixed able to read special characters Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/commit/93352e7f Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/tree/93352e7f Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/diff/93352e7f Branch: refs/heads/master Commit: 93352e7f9ce97c2252ddcb7922b51554cbcb9661 Parents: 58b9748 Author: Tim Kim Authored: Mon Jun 4 11:57:12 2012 -0700 Committer: Tim Kim Committed: Thu Jun 7 13:40:24 2012 -0700 ---------------------------------------------------------------------- lib/playbook/plugin/playbook/FileReader.js | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/blob/93352e7f/lib/playbook/plugin/playbook/FileReader.js ---------------------------------------------------------------------- diff --git a/lib/playbook/plugin/playbook/FileReader.js b/lib/playbook/plugin/playbook/FileReader.js index 8591f9c..f2f1ac6 100644 --- a/lib/playbook/plugin/playbook/FileReader.js +++ b/lib/playbook/plugin/playbook/FileReader.js @@ -94,7 +94,7 @@ FileReader.prototype.readAsText = function(file, encoding) { var getFileContents = function(path,blob){ if(blob){ - theText = blackberry.utils.blobToString(blob); + theText = blackberry.utils.blobToString(blob, enc); me.result = theText; if (typeof me.onload === "function") { @@ -175,7 +175,6 @@ FileReader.prototype.readAsDataURL = function(file) { var theText = ''; var getFileContents = function(path,blob){ if(blob){ - theText = blackberry.utils.blobToString(blob, enc); me.result = "data:text/plain;base64," +theText;