javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-18 11:17:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

update(angular): alpha.45

Browse Source
This commit is contained in:
Adam Bradley
2015-11-03 10:49:51 -06:00
parent ead95ac738
commit ab8985c860
6 changed files with 31 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ionic/components/app/structure.scss
View File

@ -106,7 +106,7 @@ ion-content-section {
} }
ion-page { ion-page {
display: flex; display: none;
flex-direction: column; flex-direction: column;
position: absolute; position: absolute;
top: 0; top: 0;
@ -114,6 +114,10 @@ ion-page {
width: 100%; width: 100%;
height: 100%; height: 100%;
transform: translateZ(0); transform: translateZ(0);
&.show-page {
display: flex;
}
} }
ion-content { ion-content {

3
ionic/components/overlay/overlay-controller.ts
View File

@ -60,6 +60,9 @@ export class OverlayController {
animation.duration(0); animation.duration(0);
} }
animation.before.addClass(overlayType); animation.before.addClass(overlayType);
if (overlayType == 'modal') {
animation.before.addClass('show-page');
}
this.app.setEnabled(false, animation.duration()); this.app.setEnabled(false, animation.duration());
this.app.setTransitioning(true, animation.duration()); this.app.setTransitioning(true, animation.duration());

3
ionic/transitions/ios-transition.ts
View File

@ -31,6 +31,9 @@ class IOSTransition extends Animation {
let enteringHasNavbar = enteringView.hasNavbar(); let enteringHasNavbar = enteringView.hasNavbar();
let leavingHasNavbar = leavingView && leavingView.hasNavbar(); let leavingHasNavbar = leavingView && leavingView.hasNavbar();
let enteringPage = new Animation(enteringView.pageRef());
enteringPage.before.addClass('show-page');
this.add(enteringPage);
// entering content // entering content
let enteringContent = new Animation(enteringView.contentRef()); let enteringContent = new Animation(enteringView.contentRef());

3
ionic/transitions/md-transition.ts
View File

@ -26,6 +26,7 @@ class MDTransition extends Animation {
// entering content item moves in bottom to center // entering content item moves in bottom to center
let enteringPage = new Animation(enteringView.pageRef()); let enteringPage = new Animation(enteringView.pageRef());
enteringPage.before.addClass('show-page');
this.add(enteringPage); this.add(enteringPage);
if (backDirection) { if (backDirection) {
@ -46,7 +47,7 @@ class MDTransition extends Animation {
enteringBackButton.before.addClass(SHOW_BACK_BTN_CSS); enteringBackButton.before.addClass(SHOW_BACK_BTN_CSS);
} else { } else {
enteringBackButton.before.removeClass(SHOW_BACK_BTN_CSS); enteringBackButton.before.removeClass(SHOW_BACK_BTN_CSS);
} }
} }
// setup leaving view // setup leaving view

6
package.json
View File

@ -20,14 +20,14 @@
"tooling" "tooling"
], ],
"dependencies": { "dependencies": {
"@reactivex/rxjs": "5.0.0-alpha.4", "@reactivex/rxjs": "5.0.0-alpha.7",
"angular2": "2.0.0-alpha.44", "angular2": "2.0.0-alpha.45",
"colors": "^1.1.2", "colors": "^1.1.2",
"es6-shim": "0.33.6", "es6-shim": "0.33.6",
"inquirer": "0.11.0", "inquirer": "0.11.0",
"lodash": "3.10.1", "lodash": "3.10.1",
"q": "1.4.1", "q": "1.4.1",
"reflect-metadata": "0.1.1", "reflect-metadata": "0.1.2",
"shelljs": "0.5.3", "shelljs": "0.5.3",
"zone.js": "0.5.8" "zone.js": "0.5.8"
}, },

34
scripts/snapshot/snapshot.task.js
View File

@ -47,18 +47,16 @@ module.exports = function(gulp, argv, buildConfig) {
snapshotValues.params.upload = !quickMode; snapshotValues.params.upload = !quickMode;
var protractorArgs = [ var protractorArgs = [
'--browser <%= browser %>', '--browser ' + snapshotValues.browser,
'--platform <%= platform %>', '--platform ' + snapshotValues.platform,
'--params.platform_id=<%= params.platform_id %>', '--params.platform_id=' + snapshotValues.params.platform_id,
'--params.platform_index=<%= params.platform_index %>', '--params.platform_index=' + snapshotValues.params.platform_index,
'--params.platform_count=<%= params.platform_count %>', '--params.platform_count=' + snapshotValues.params.platform_count,
'--params.width=<%= params.width %>', '--params.width=' + snapshotValues.params.width,
'--params.height=<%= params.height %>', '--params.height=' + snapshotValues.params.height,
'--params.test_id=<%= params.test_id %>', '--params.test_id=' + snapshotValues.params.test_id,
'--params.upload=<%= params.upload %>', '--params.upload=' + snapshotValues.params.upload
].map(function(argument) { ];
return _.template(argument, snapshotValues);
});
e2ePublish(testId, false); e2ePublish(testId, false);
@ -70,16 +68,14 @@ module.exports = function(gulp, argv, buildConfig) {
stdio: [process.stdin, process.stdout, 'pipe'] stdio: [process.stdin, process.stdout, 'pipe']
}); });
var finish = _.once(function(err) { child.stderr.on('data', function(data) {
err && done(err) || done();
protractorHttpServer.close(); protractorHttpServer.close();
done('Protractor tests failed. Error:', data.toString());
}); });
child.stderr.on('data', function(data) {
finish('Protractor tests failed. Error:', data.toString());
});
child.on('exit', function() { child.on('exit', function() {
finish(); protractorHttpServer.close();
done();
}); });
} }
@ -94,7 +90,7 @@ module.exports = function(gulp, argv, buildConfig) {
var chars = 'abcdefghijklmnopqrstuvwxyz'; var chars = 'abcdefghijklmnopqrstuvwxyz';
var id = chars.charAt(Math.floor(Math.random() * chars.length)); var id = chars.charAt(Math.floor(Math.random() * chars.length));
chars += '0123456789'; chars += '0123456789';
while (id.length < 3) { while (id.length < 4) {
id += chars.charAt(Math.floor(Math.random() * chars.length)); id += chars.charAt(Math.floor(Math.random() * chars.length));
} }
return id; return id;