You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by sh...@apache.org on 2015/05/08 03:40:16 UTC
[1/2] cordova-lib git commit: CB-6462 CB-6026 - Orientation
preference now updates `UISupportedInterfaceOrientations~ipad` too.
Repository: cordova-lib
Updated Branches:
refs/heads/master d6f2b1141 -> 76ecfd182
CB-6462 CB-6026 - Orientation preference now updates `UISupportedInterfaceOrientations~ipad` too.
Also deleting iPad orientation values
Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/93ab6b61
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/93ab6b61
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/93ab6b61
Branch: refs/heads/master
Commit: 93ab6b6174b579130efcd56f4a5c0fcebb93296f
Parents: d6f2b11
Author: Rachel Carvalho <ra...@gmail.com>
Authored: Mon Apr 13 14:27:15 2015 -0400
Committer: Shazron Abdullah <sh...@apache.org>
Committed: Thu May 7 16:56:28 2015 -0700
----------------------------------------------------------------------
cordova-lib/spec-cordova/metadata/ios_parser.spec.js | 3 +++
cordova-lib/src/cordova/metadata/ios_parser.js | 4 ++++
2 files changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/93ab6b61/cordova-lib/spec-cordova/metadata/ios_parser.spec.js
----------------------------------------------------------------------
diff --git a/cordova-lib/spec-cordova/metadata/ios_parser.spec.js b/cordova-lib/spec-cordova/metadata/ios_parser.spec.js
index d338b20..6ab42da 100644
--- a/cordova-lib/spec-cordova/metadata/ios_parser.spec.js
+++ b/cordova-lib/spec-cordova/metadata/ios_parser.spec.js
@@ -143,6 +143,7 @@ describe('ios project parser', function () {
getOrientation.andCallThrough();
wrapper(p.update_from_config(cfg), done, function() {
expect(plist_build.mostRecentCall.args[0].UISupportedInterfaceOrientations).toEqual([ 'UIInterfaceOrientationPortrait', 'UIInterfaceOrientationPortraitUpsideDown' ]);
+ expect(plist_build.mostRecentCall.args[0]['UISupportedInterfaceOrientations~ipad']).toEqual([ 'UIInterfaceOrientationPortrait', 'UIInterfaceOrientationPortraitUpsideDown' ]);
expect(plist_build.mostRecentCall.args[0].UIInterfaceOrientation).toEqual([ 'UIInterfaceOrientationPortrait' ]);
});
});
@@ -150,6 +151,7 @@ describe('ios project parser', function () {
getOrientation.andReturn('');
wrapper(p.update_from_config(cfg), done, function() {
expect(plist_build.mostRecentCall.args[0].UISupportedInterfaceOrientations).toBeUndefined();
+ expect(plist_build.mostRecentCall.args[0]['UISupportedInterfaceOrientations~ipad']).toBeUndefined();
expect(plist_build.mostRecentCall.args[0].UIInterfaceOrientation).toBeUndefined();
});
});
@@ -157,6 +159,7 @@ describe('ios project parser', function () {
getOrientation.andReturn(p.helper.ORIENTATION_DEFAULT);
wrapper(p.update_from_config(cfg), done, function() {
expect(plist_build.mostRecentCall.args[0].UISupportedInterfaceOrientations).toBeUndefined();
+ expect(plist_build.mostRecentCall.args[0]['UISupportedInterfaceOrientations~ipad']).toBeUndefined();
expect(plist_build.mostRecentCall.args[0].UIInterfaceOrientation).toBeUndefined();
});
});
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/93ab6b61/cordova-lib/src/cordova/metadata/ios_parser.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/metadata/ios_parser.js b/cordova-lib/src/cordova/metadata/ios_parser.js
index ed5fff3..e182f88 100644
--- a/cordova-lib/src/cordova/metadata/ios_parser.js
+++ b/cordova-lib/src/cordova/metadata/ios_parser.js
@@ -86,17 +86,21 @@ ios_parser.prototype.update_from_config = function(config) {
case 'portrait':
infoPlist['UIInterfaceOrientation'] = [ 'UIInterfaceOrientationPortrait' ];
infoPlist['UISupportedInterfaceOrientations'] = [ 'UIInterfaceOrientationPortrait', 'UIInterfaceOrientationPortraitUpsideDown' ];
+ infoPlist['UISupportedInterfaceOrientations~ipad'] = [ 'UIInterfaceOrientationPortrait', 'UIInterfaceOrientationPortraitUpsideDown' ];
break;
case 'landscape':
infoPlist['UIInterfaceOrientation'] = [ 'UIInterfaceOrientationLandscapeLeft' ];
infoPlist['UISupportedInterfaceOrientations'] = [ 'UIInterfaceOrientationLandscapeLeft', 'UIInterfaceOrientationLandscapeRight' ];
+ infoPlist['UISupportedInterfaceOrientations~ipad'] = [ 'UIInterfaceOrientationLandscapeLeft', 'UIInterfaceOrientationLandscapeRight' ];
break;
default:
infoPlist['UIInterfaceOrientation'] = [ orientation ];
delete infoPlist['UISupportedInterfaceOrientations'];
+ delete infoPlist['UISupportedInterfaceOrientations~ipad'];
}
} else {
delete infoPlist['UISupportedInterfaceOrientations'];
+ delete infoPlist['UISupportedInterfaceOrientations~ipad'];
delete infoPlist['UIInterfaceOrientation'];
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[2/2] cordova-lib git commit: CB-8989 - cordova-lib jasmine tests are
failing on older hardware
Posted by sh...@apache.org.
CB-8989 - cordova-lib jasmine tests are failing on older hardware
Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/76ecfd18
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/76ecfd18
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/76ecfd18
Branch: refs/heads/master
Commit: 76ecfd182cb91dd981d78493d3eafe919b81981d
Parents: 93ab6b6
Author: Shazron Abdullah <sh...@apache.org>
Authored: Thu May 7 18:40:14 2015 -0700
Committer: Shazron Abdullah <sh...@apache.org>
Committed: Thu May 7 18:40:14 2015 -0700
----------------------------------------------------------------------
cordova-lib/spec-plugman/install-browserify.spec.js | 2 +-
cordova-lib/spec-plugman/install.spec.js | 2 +-
cordova-lib/spec-plugman/uninstall.spec.js | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/76ecfd18/cordova-lib/spec-plugman/install-browserify.spec.js
----------------------------------------------------------------------
diff --git a/cordova-lib/spec-plugman/install-browserify.spec.js b/cordova-lib/spec-plugman/install-browserify.spec.js
index 0210cca..39df471 100644
--- a/cordova-lib/spec-plugman/install-browserify.spec.js
+++ b/cordova-lib/spec-plugman/install-browserify.spec.js
@@ -146,7 +146,7 @@ describe('start', function() {
expect(error).toBeUndefined();
}
);
- waitsFor(function() { return done; }, 'promise never resolved', 500);
+ waitsFor(function() { return done; }, 'promise never resolved', 2000);
});
});
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/76ecfd18/cordova-lib/spec-plugman/install.spec.js
----------------------------------------------------------------------
diff --git a/cordova-lib/spec-plugman/install.spec.js b/cordova-lib/spec-plugman/install.spec.js
index 75efcd7..67bc543 100644
--- a/cordova-lib/spec-plugman/install.spec.js
+++ b/cordova-lib/spec-plugman/install.spec.js
@@ -144,7 +144,7 @@ describe('start', function() {
expect(error).toBeUndefined();
}
);
- waitsFor(function() { return done; }, 'promise never resolved', 500);
+ waitsFor(function() { return done; }, 'promise never resolved', 2000);
});
});
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/76ecfd18/cordova-lib/spec-plugman/uninstall.spec.js
----------------------------------------------------------------------
diff --git a/cordova-lib/spec-plugman/uninstall.spec.js b/cordova-lib/spec-plugman/uninstall.spec.js
index 6cff6b0..552ee00 100644
--- a/cordova-lib/spec-plugman/uninstall.spec.js
+++ b/cordova-lib/spec-plugman/uninstall.spec.js
@@ -75,7 +75,7 @@ describe('start', function() {
}, function(err) {
done = err.stack;
});
- waitsFor(function() { return done; }, 'promise never resolved', 500);
+ waitsFor(function() { return done; }, 'promise never resolved', 2000);
runs(function() {
expect(done).toBe(true);
});
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org