Skip to content

Commit 4e5d762

Browse files
committed
Merge pull request #85 from vincent99/master
Enable Machine for DigitalOcean
2 parents 0982980 + 18e49ea commit 4e5d762

3 files changed

Lines changed: 7 additions & 4 deletions

File tree

app/mixins/throttled-resize.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import Ember from 'ember';
33
export default Ember.Mixin.create({
44
boundResize: null,
55
throttleTimer: null,
6+
resizeInterval: 200,
67

78
didInsertElement: function() {
89
this._super();
@@ -14,7 +15,7 @@ export default Ember.Mixin.create({
1415
},
1516

1617
triggerResize: function() {
17-
var timer = Ember.run.throttle(this, 'onResize', 200, false);
18+
var timer = Ember.run.throttle(this, 'onResize', this.get('resizeInterval'), false);
1819
this.set('throttleTimer', timer);
1920
},
2021

app/pods/hosts/new/controller.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import Ember from 'ember';
22

33
var DRIVERS = [
4-
{route: 'hosts.new.digitalocean', label: 'DigitalOcean', available: false },
4+
{route: 'hosts.new.digitalocean', label: 'DigitalOcean', available: true },
55
{route: 'hosts.new.openstack', label: 'OpenStack', available: false },
66
{route: 'hosts.new.custom', label: 'Custom/Bare Metal', available: true },
77
];
88

99
export default Ember.ObjectController.extend({
10-
lastRoute: DRIVERS.filter((driver) => { return driver.available; })[0].route,
10+
lastRoute: 'hosts.new.custom',
1111
drivers: DRIVERS,
1212
});

app/pods/hosts/new/route.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ import OverlayRoute from 'ui/pods/overlay/route';
33
export default OverlayRoute.extend({
44
actions: {
55
cancel: function() {
6-
this.send('goToPrevious');
6+
// @TODO don't remember switches between tabs as previous routes
7+
//this.send('goToPrevious');
8+
this.transitionTo('hosts');
79
}
810
},
911

0 commit comments

Comments
 (0)