Skip to content

Commit 3c23369

Browse files
mlynchmlynch
committed
Fixed #179 
1 parent 91826e3 commit 3c23369

File tree

5 files changed

+146
-12
lines changed

5 files changed

+146
-12
lines changed

‎dist/js/ionic-angular.js‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1872,7 +1872,9 @@ angular.module('ionic.ui.sideMenu', ['ionic.service.gesture'])
18721872
e.gesture.srcEvent.preventDefault();
18731873
};
18741874

1875-
var dragGesture = Gesture.on('drag', dragFn, $element);
1875+
//var dragGesture = Gesture.on('drag', dragFn, $element);
1876+
var dragRightGesture = Gesture.on('dragright', dragFn, $element);
1877+
var dragLeftGesture = Gesture.on('dragleft', dragFn, $element);
18761878

18771879
var dragReleaseFn = function(e) {
18781880
if(!defaultPrevented) {
@@ -1907,7 +1909,8 @@ angular.module('ionic.ui.sideMenu', ['ionic.service.gesture'])
19071909

19081910
// Cleanup
19091911
$scope.$on('$destroy', function() {
1910-
Gesture.off(dragGesture, 'drag', dragFn);
1912+
Gesture.off(dragLeftGesture, 'drag', dragFn);
1913+
Gesture.off(dragRightGesture, 'drag', dragFn);
19111914
Gesture.off(releaseGesture, 'release', dragReleaseFn);
19121915
});
19131916
};

‎js/ext/angular/src/directive/ionicSideMenu.js‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,9 @@ angular.module('ionic.ui.sideMenu', ['ionic.service.gesture'])
7171
e.gesture.srcEvent.preventDefault();
7272
};
7373

74-
var dragGesture = Gesture.on('drag', dragFn, $element);
74+
//var dragGesture = Gesture.on('drag', dragFn, $element);
75+
var dragRightGesture = Gesture.on('dragright', dragFn, $element);
76+
var dragLeftGesture = Gesture.on('dragleft', dragFn, $element);
7577

7678
var dragReleaseFn = function(e) {
7779
if(!defaultPrevented) {
@@ -106,7 +108,8 @@ angular.module('ionic.ui.sideMenu', ['ionic.service.gesture'])
106108

107109
// Cleanup
108110
$scope.$on('$destroy', function() {
109-
Gesture.off(dragGesture, 'drag', dragFn);
111+
Gesture.off(dragLeftGesture, 'drag', dragFn);
112+
Gesture.off(dragRightGesture, 'drag', dragFn);
110113
Gesture.off(releaseGesture, 'release', dragReleaseFn);
111114
});
112115
};

‎js/ext/angular/test/content.html‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,6 @@
5959
title="'Title'"
6060
type="bar-primary"></header-bar>
6161

62-
<div class="bar bar-subheader">
63-
<div class="button-bar">
64-
<a class="button">Success</a>
65-
<a class="button">Warning</a>
66-
<a class="button">Danger</a>
67-
</div>
68-
</div>
69-
7062
<content
7163
on-refresh="onRefresh()"
7264
on-refresh-opening="onRefreshOpening(amount)"

‎js/ext/angular/test/overflow.html‎

Lines changed: 136 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,136 @@
1+
<html ng-app="navTest">
2+
<head>
3+
<meta charset="utf-8">
4+
<title>Content</title>
5+
6+
<!-- Sets initial viewport load and disables zooming -->
7+
<meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no">
8+
<link rel="stylesheet" href="../../../../dist/css/ionic.css">
9+
10+
<script src="../../../../dist/js/ionic.js"></script>
11+
<script src="../../../../dist/js/angular/angular.js"></script>
12+
<script src="../../../../dist/js/angular/angular-animate.js"></script>
13+
<script src="../../../../dist/js/angular/angular-route.js"></script>
14+
<script src="../../../../dist/js/angular/angular-touch.js"></script>
15+
<script src="../../../../dist/js/angular/angular-sanitize.js"></script>
16+
<script src="../../../../dist/js/ionic-angular.js"></script>
17+
<style>
18+
.reveal-animation {
19+
/*
20+
-webkit-transform: translate3d(0%, 0, 0);
21+
transform: translate3d(0%, 0, 0);
22+
23+
-webkit-transition: -webkit-transform 1s ease-in-out;
24+
transition: transform 1s ease-in-out;
25+
*/
26+
}
27+
.reveal-animation.ng-enter {
28+
-webkit-transition: .2s ease-in-out all;
29+
-webkit-transform:translate3d(100%,0,0) ;
30+
}
31+
.reveal-animation.ng-enter-active {
32+
-webkit-transform:translate3d(0,0,0) ;
33+
}
34+
.reveal-animation.ng-leave {
35+
-webkit-transition: .2s ease-in-out all;
36+
-webkit-transform:translate3d(0%,0,0);
37+
}
38+
.reveal-animation.ng-leave-active {
39+
-webkit-transition: .2s ease-in-out all;
40+
-webkit-transform:translate3d(-100%,0,0);
41+
}
42+
43+
.scroll-refresher {
44+
border-bottom: 1px solid #eee;
45+
}
46+
#refresh-content {
47+
color: #999;
48+
text-align: center;
49+
font-size: 48px;
50+
position: absolute;
51+
bottom: 10px;
52+
width: 100%;
53+
}
54+
</style>
55+
56+
</head>
57+
<body ng-controller="AppCtrl">
58+
<side-menus>
59+
<pane side-menu-content>
60+
<header-bar
61+
title="'Title'"
62+
type="bar-primary"></header-bar>
63+
64+
<div class="bar bar-subheader">
65+
<div class="button-bar">
66+
<a class="button">Success</a>
67+
<a class="button">Warning</a>
68+
<a class="button">Danger</a>
69+
</div>
70+
</div>
71+
72+
<content
73+
has-header="false"
74+
has-subheader="true"
75+
has-footer="true"
76+
overflow-scroll="true"
77+
>
78+
79+
<div style="height: 3000px; width: 100%; background: url('tree_bark.png') repeat"></div>
80+
</content>
81+
82+
<footer-bar type="bar-assertive">
83+
<h1 class="title">Footer</h1>
84+
</footer-bar>
85+
</pane>
86+
<side-menu side="left">
87+
<header class="bar bar-header bar-assertive">
88+
<h1 class="title">Left</h1>
89+
</header>
90+
<content has-header="true" overflow-scroll="true">
91+
<ul class="list">
92+
<a href="#" class="item" ng-repeat="item in list">
93+
{{item.text}}
94+
</a>
95+
</ul>
96+
</content>
97+
</side-menu>
98+
<side-menu side="right">
99+
<header class="bar bar-header bar-assertive">
100+
<h1 class="title">Right</h1>
101+
</header>
102+
<content has-header="true">
103+
<ul class="list">
104+
<a href="#" class="item" ng-repeat="item in list">
105+
{{item.text}}
106+
</a>
107+
</ul>
108+
</content>
109+
</side-menu>
110+
</side-menus>
111+
112+
<script>
113+
angular.module('navTest', ['ionic'])
114+
115+
.controller('AppCtrl', function($scope, $compile, $timeout, $element) {
116+
$scope.items = [];
117+
for(var i = 0; i < 200; i++) {
118+
$scope.items.push({
119+
});
120+
}
121+
$scope.what = {};
122+
$scope.onRefresh = function() {
123+
console.log('On refresh');
124+
$timeout(function() {
125+
$scope.refreshComplete();
126+
}, 2000);
127+
}
128+
$scope.onRefreshOpening = function(amt) {
129+
console.log('On refresh opening', amt);
130+
}
131+
132+
})
133+
</script>
134+
</body>
135+
</html>
136+

‎js/ext/angular/test/tree_bark.png‎

41.4 KB
Loading

0 commit comments

Comments
 (0)