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 4E6ED9851 for ; Thu, 15 Mar 2012 19:36:25 +0000 (UTC) Received: (qmail 19696 invoked by uid 500); 15 Mar 2012 19:36:25 -0000 Delivered-To: apmail-incubator-callback-commits-archive@incubator.apache.org Received: (qmail 19600 invoked by uid 500); 15 Mar 2012 19:36:25 -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 19585 invoked by uid 99); 15 Mar 2012 19:36:25 -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, 15 Mar 2012 19:36:25 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id E354F73FE; Thu, 15 Mar 2012 19:36:24 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: filmaj@apache.org To: callback-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [2/21] git commit: adding proper dependencies to ios specific filereader plugin as per Beckys findings Message-Id: <20120315193624.E354F73FE@tyr.zones.apache.org> Date: Thu, 15 Mar 2012 19:36:24 +0000 (UTC) adding proper dependencies to ios specific filereader plugin as per Beckys findings 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/1d63465c Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/tree/1d63465c Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/diff/1d63465c Branch: refs/heads/master Commit: 1d63465c12cd5c50630a08d020ca8aa6df6c9b02 Parents: 9973152 Author: Fil Maj Authored: Wed Mar 14 15:35:19 2012 -0700 Committer: Fil Maj Committed: Thu Mar 15 10:18:36 2012 -0700 ---------------------------------------------------------------------- lib/platform/ios.js | 2 +- lib/plugin/ios/FileReader.js | 5 +++++ 2 files changed, 6 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/blob/1d63465c/lib/platform/ios.js ---------------------------------------------------------------------- diff --git a/lib/platform/ios.js b/lib/platform/ios.js index d99c3e9..041ec9d 100644 --- a/lib/platform/ios.js +++ b/lib/platform/ios.js @@ -18,7 +18,7 @@ module.exports = { FileReader.prototype.readAsText = require('cordova/plugin/ios/FileReader').readAsText; }, objects: { - File: { // exists natively , override + File: { // exists natively, override path: "cordova/plugin/File" }, MediaError: { // exists natively, override http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/blob/1d63465c/lib/plugin/ios/FileReader.js ---------------------------------------------------------------------- diff --git a/lib/plugin/ios/FileReader.js b/lib/plugin/ios/FileReader.js index 86b0ae8..5711393 100644 --- a/lib/plugin/ios/FileReader.js +++ b/lib/plugin/ios/FileReader.js @@ -1,3 +1,8 @@ +var exec = require('cordova/exec'), + FileError = require('cordova/plugin/FileError'), + FileReader = require('cordova/plugin/FileReader'), + ProgressEvent = require('cordova/plugin/ProgressEvent'); + module.exports = { readAsText:function(file, encoding) { // Figure out pathing