You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ag...@apache.org on 2013/06/18 19:49:34 UTC

ios commit: Update JS snapshot to version 2.9.0rc1

Updated Branches:
  refs/heads/master ccf5d88a4 -> d9d77c4fa


Update JS snapshot to version 2.9.0rc1


Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/d9d77c4f
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/d9d77c4f
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/d9d77c4f

Branch: refs/heads/master
Commit: d9d77c4fa6db02638fa399304d76aab70c66066e
Parents: ccf5d88
Author: Andrew Grieve <ag...@chromium.org>
Authored: Tue Jun 18 13:49:32 2013 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Tue Jun 18 13:49:32 2013 -0400

----------------------------------------------------------------------
 CordovaLib/cordova.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/d9d77c4f/CordovaLib/cordova.js
----------------------------------------------------------------------
diff --git a/CordovaLib/cordova.js b/CordovaLib/cordova.js
index 0dc412a..a3d1ae0 100644
--- a/CordovaLib/cordova.js
+++ b/CordovaLib/cordova.js
@@ -1,5 +1,5 @@
 // Platform: ios
-// 2.8.0-0-g6208c95
+// 2.7.0rc1-75-g76065a1
 /*
  Licensed to the Apache Software Foundation (ASF) under one
  or more contributor license agreements.  See the NOTICE file
@@ -19,7 +19,7 @@
  under the License.
 */
 ;(function() {
-var CORDOVA_JS_BUILD_LABEL = '2.8.0-0-g6208c95';
+var CORDOVA_JS_BUILD_LABEL = '2.7.0rc1-75-g76065a1';
 // file: lib/scripts/require.js
 
 var require,
@@ -2383,7 +2383,11 @@ function initRead(reader, file) {
     reader._error = null;
     reader._readyState = FileReader.LOADING;
 
-    if (typeof file.fullPath == 'string') {
+    if (typeof file == 'string') {
+        // Deprecated in Cordova 2.4.
+        console.warn('Using a string argument with FileReader.readAs functions is deprecated.');
+        reader._fileName = file;
+    } else if (typeof file.fullPath == 'string') {
         reader._fileName = file.fullPath;
     } else {
         reader._fileName = '';


Re: ios commit: Update JS snapshot to version 2.9.0rc1

Posted by Andrew Grieve <ag...@chromium.org>.
ha ha, nice catch. I'll look at this now.


On Tue, Jun 18, 2013 at 7:23 PM, Shazron <sh...@gmail.com> wrote:

> The version in the js says 2.7.0rc1 :/
>
>
> On Tue, Jun 18, 2013 at 10:49 AM, <ag...@apache.org> wrote:
>
> > Updated Branches:
> >   refs/heads/master ccf5d88a4 -> d9d77c4fa
> >
> >
> > Update JS snapshot to version 2.9.0rc1
> >
> >
> > Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo
> > Commit:
> http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/d9d77c4f
> > Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/d9d77c4f
> > Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/d9d77c4f
> >
> > Branch: refs/heads/master
> > Commit: d9d77c4fa6db02638fa399304d76aab70c66066e
> > Parents: ccf5d88
> > Author: Andrew Grieve <ag...@chromium.org>
> > Authored: Tue Jun 18 13:49:32 2013 -0400
> > Committer: Andrew Grieve <ag...@chromium.org>
> > Committed: Tue Jun 18 13:49:32 2013 -0400
> >
> > ----------------------------------------------------------------------
> >  CordovaLib/cordova.js | 10 +++++++---
> >  1 file changed, 7 insertions(+), 3 deletions(-)
> > ----------------------------------------------------------------------
> >
> >
> >
> >
> http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/d9d77c4f/CordovaLib/cordova.js
> > ----------------------------------------------------------------------
> > diff --git a/CordovaLib/cordova.js b/CordovaLib/cordova.js
> > index 0dc412a..a3d1ae0 100644
> > --- a/CordovaLib/cordova.js
> > +++ b/CordovaLib/cordova.js
> > @@ -1,5 +1,5 @@
> >  // Platform: ios
> > -// 2.8.0-0-g6208c95
> > +// 2.7.0rc1-75-g76065a1
> >  /*
> >   Licensed to the Apache Software Foundation (ASF) under one
> >   or more contributor license agreements.  See the NOTICE file
> > @@ -19,7 +19,7 @@
> >   under the License.
> >  */
> >  ;(function() {
> > -var CORDOVA_JS_BUILD_LABEL = '2.8.0-0-g6208c95';
> > +var CORDOVA_JS_BUILD_LABEL = '2.7.0rc1-75-g76065a1';
> >  // file: lib/scripts/require.js
> >
> >  var require,
> > @@ -2383,7 +2383,11 @@ function initRead(reader, file) {
> >      reader._error = null;
> >      reader._readyState = FileReader.LOADING;
> >
> > -    if (typeof file.fullPath == 'string') {
> > +    if (typeof file == 'string') {
> > +        // Deprecated in Cordova 2.4.
> > +        console.warn('Using a string argument with FileReader.readAs
> > functions is deprecated.');
> > +        reader._fileName = file;
> > +    } else if (typeof file.fullPath == 'string') {
> >          reader._fileName = file.fullPath;
> >      } else {
> >          reader._fileName = '';
> >
> >
>

Re: ios commit: Update JS snapshot to version 2.9.0rc1

Posted by Shazron <sh...@gmail.com>.
The version in the js says 2.7.0rc1 :/


On Tue, Jun 18, 2013 at 10:49 AM, <ag...@apache.org> wrote:

> Updated Branches:
>   refs/heads/master ccf5d88a4 -> d9d77c4fa
>
>
> Update JS snapshot to version 2.9.0rc1
>
>
> Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo
> Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/d9d77c4f
> Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/d9d77c4f
> Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/d9d77c4f
>
> Branch: refs/heads/master
> Commit: d9d77c4fa6db02638fa399304d76aab70c66066e
> Parents: ccf5d88
> Author: Andrew Grieve <ag...@chromium.org>
> Authored: Tue Jun 18 13:49:32 2013 -0400
> Committer: Andrew Grieve <ag...@chromium.org>
> Committed: Tue Jun 18 13:49:32 2013 -0400
>
> ----------------------------------------------------------------------
>  CordovaLib/cordova.js | 10 +++++++---
>  1 file changed, 7 insertions(+), 3 deletions(-)
> ----------------------------------------------------------------------
>
>
>
> http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/d9d77c4f/CordovaLib/cordova.js
> ----------------------------------------------------------------------
> diff --git a/CordovaLib/cordova.js b/CordovaLib/cordova.js
> index 0dc412a..a3d1ae0 100644
> --- a/CordovaLib/cordova.js
> +++ b/CordovaLib/cordova.js
> @@ -1,5 +1,5 @@
>  // Platform: ios
> -// 2.8.0-0-g6208c95
> +// 2.7.0rc1-75-g76065a1
>  /*
>   Licensed to the Apache Software Foundation (ASF) under one
>   or more contributor license agreements.  See the NOTICE file
> @@ -19,7 +19,7 @@
>   under the License.
>  */
>  ;(function() {
> -var CORDOVA_JS_BUILD_LABEL = '2.8.0-0-g6208c95';
> +var CORDOVA_JS_BUILD_LABEL = '2.7.0rc1-75-g76065a1';
>  // file: lib/scripts/require.js
>
>  var require,
> @@ -2383,7 +2383,11 @@ function initRead(reader, file) {
>      reader._error = null;
>      reader._readyState = FileReader.LOADING;
>
> -    if (typeof file.fullPath == 'string') {
> +    if (typeof file == 'string') {
> +        // Deprecated in Cordova 2.4.
> +        console.warn('Using a string argument with FileReader.readAs
> functions is deprecated.');
> +        reader._fileName = file;
> +    } else if (typeof file.fullPath == 'string') {
>          reader._fileName = file.fullPath;
>      } else {
>          reader._fileName = '';
>
>