Skip to content

Commit 0df82eb

Browse files
committed
Merge commit 'b1d8e7b08a4ed44325b1148e765b8e5c34e79046'
Conflicts: app/scripts/app.js app/scripts/menu/menu.html
2 parents 5a5e898 + b1d8e7b commit 0df82eb

File tree

5 files changed

+76
-1
lines changed

5 files changed

+76
-1
lines changed

app/scripts/app.js

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ angular.module('starter', [
1818
'supermodular.elements',
1919
'supermodular.popover-menu',
2020
'supermodular.native-scrolling',
21+
'supermodular.new-slide-box',
2122
'gMaps',
2223
'ngCordova'
2324
])

app/scripts/menu/menu.html

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<ion-side-menus enable-menu-with-back-views="false">
2-
<ion-side-menu-content>
2+
<ion-side-menu-content
3+
edge-drag-threshold="true">
34
<ion-nav-bar class="bar-stable">
45
<ion-nav-back-button>
56
</ion-nav-back-button>
@@ -37,6 +38,9 @@ <h1 class="title">Left</h1>
3738
<ion-item nav-clear menu-close class="item-icon-left" href="#/app/native-scrolling">
3839
<i class="icon ion-ios-list-outline"></i>
3940
Native scrolling
41+
<ion-item nav-clear menu-close class="item-icon-left" href="#/app/new-slide-box">
42+
<i class="icon ion-arrow-swap"></i>
43+
New slide box
4044
</ion-item>
4145
<ion-item nav-clear menu-close class="item-icon-left" href="#/app/map">
4246
<i class="icon ion-map"></i>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
(function() {
2+
'use strict';
3+
4+
angular
5+
.module('supermodular.new-slide-box')
6+
.controller('NewSlideBoxController', NewSlideBoxController);
7+
8+
NewSlideBoxController.$inject = [];
9+
10+
/* @ngInject */
11+
function NewSlideBoxController() {
12+
var vm = angular.extend(this, {
13+
items: getItems(),
14+
options: {
15+
loop: true
16+
}
17+
});
18+
19+
// ********************************************************************
20+
21+
function getItems() {
22+
var items = [];
23+
for (var i = 1;i <= 7;i++) {
24+
//
25+
// Local stored images
26+
//
27+
// items.push({
28+
// image: 'images/cards/face-' + i + '.jpg'
29+
// });
30+
//
31+
// Online images
32+
//
33+
items.push({
34+
image: 'http://lorempixel.com/786/1024/nightlife/' + i + '/'
35+
});
36+
}
37+
return items;
38+
}
39+
}
40+
})();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<ion-view view-title="New slide box">
2+
<ion-content>
3+
<ion-slides options="vm.options">
4+
<ion-slide-page ng-repeat="item in vm.items">
5+
<img ng-src="{{item.image}}">
6+
</ion-slide-page>
7+
</ion-slides>
8+
</ion-content>
9+
</ion-view>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
(function() {
2+
'use strict';
3+
4+
angular
5+
.module('supermodular.new-slide-box', [
6+
'ionic',
7+
'supermodular.common'
8+
])
9+
.config(function($stateProvider) {
10+
$stateProvider
11+
.state('app.new-slide-box', {
12+
url: '/new-slide-box',
13+
views: {
14+
'menuContent': {
15+
templateUrl: 'scripts/new-slide-box/new-slide-box.html',
16+
controller: 'NewSlideBoxController as vm'
17+
}
18+
}
19+
});
20+
});
21+
})();

0 commit comments

Comments
 (0)