Skip to content

Commit e6922ce

Browse files
author
Becky Sroufe
committed
Loading view in progress
1 parent b920c31 commit e6922ce

File tree

5 files changed

+33
-39
lines changed

5 files changed

+33
-39
lines changed

app/app-js/modules/loading/loading.controller.js

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,13 @@ define(function (require) {
1515
}
1616
},
1717

18-
initialize: function () {
19-
console.log('HERE!');
20-
// this.loadingView = new LoadingView();
21-
// appChannel.commands.execute('showin:loadingRegion', this.loadingView);
22-
},
23-
2418
loadingData: function (modalData) {
19+
this.loadingView = new LoadingView();
20+
appChannel.commands.execute('showin:loadingRegion', this.loadingView);
2521
},
2622

2723
loadedData: function () {
24+
appChannel.commands.execute('close:loadingRegion', this.loadingView);
2825
}
2926
});
3027

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<h4>Loading ...</h4>
Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,28 @@
11
define(function (require) {
2-
// require anything you need
2+
var Marionette = require('marionette'),
3+
template = require('hgn!modules/loading/loading.view'),
4+
LoadingView;
35

4-
// build the view
5-
6-
return 'The view :)';
6+
LoadingView = Marionette.ItemView.extend({
7+
template: template,
8+
className: 'loading-modal',
9+
10+
/*
11+
ui: {
12+
loadingModal: '.loading-modal'
13+
},
14+
15+
events: {
16+
},
17+
18+
initialize: function () {
19+
console.log('initializing loading view working!');
20+
},
21+
22+
modalShow: function () {
23+
}
24+
*/
25+
});
26+
27+
return LoadingView;
728
});

app/app-js/modules/welcome/welcome.view.js

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -6,35 +6,6 @@ define(function (require) {
66
StartView = Marionette.ItemView.extend({
77
template: template
88
// className: 'container-fluid'
9-
10-
/*
11-
onShow: function () {
12-
_.defer(function() {
13-
var totalHeight = '100%',
14-
$uriField = $('.js-input-expand');
15-
16-
$uriField.each(function() {
17-
$(this).data('height', $(this).height());
18-
});
19-
20-
$('.js-input-expand')
21-
.focus(function() {
22-
$(this).animate({
23-
height: 100
24-
},
25-
'slow'
26-
);
27-
})
28-
29-
.blur(function() {
30-
$(this).animate({
31-
height: totalHeight
32-
},
33-
'slow'
34-
);
35-
});
36-
});
37-
}*/
389
});
3910

4011
return StartView;

app/less/buttons.less

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,8 @@
1010

1111
.btn-red {
1212
.button-variant(@brand-danger, #fff, @brand-danger);
13+
&:hover {
14+
color: #fff;
15+
background-color: lighten(@brand-danger, 5%);
16+
}
1317
}

0 commit comments

Comments
 (0)