Skip to content
This repository was archived by the owner on Sep 28, 2020. It is now read-only.

Commit cf29924

Browse files
Update simple_example demo to use latest slidescroll bower component
1 parent 0bcef56 commit cf29924

File tree

4 files changed

+43
-36
lines changed

4 files changed

+43
-36
lines changed
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "funkyrobot-angular-slidescroll",
3-
"version": "0.0.5",
3+
"version": "0.0.10",
44
"main": "angular-slidescroll.js",
55
"ignore": [
66
"**/.*",
@@ -10,14 +10,14 @@
1010
"angular": "~1.4.3"
1111
},
1212
"homepage": "https://github.com/net-funkyrobot/funkyrobot-angular-slidescroll",
13-
"_release": "0.0.5",
13+
"_release": "0.0.10",
1414
"_resolution": {
1515
"type": "version",
16-
"tag": "0.0.5",
17-
"commit": "d23371281d2f1caa1028eea91c79df8ed0addc00"
16+
"tag": "0.0.10",
17+
"commit": "45e3f478fc6abf7d72a15b1fec334b08c177740c"
1818
},
1919
"_source": "git://github.com/net-funkyrobot/funkyrobot-angular-slidescroll.git",
20-
"_target": "~0.0.5",
20+
"_target": "^0.0.10",
2121
"_originalSource": "net-funkyrobot/funkyrobot-angular-slidescroll",
2222
"_direct": true
2323
}

demos/simple_example/bower_components/funkyrobot-angular-slidescroll/angular-slidescroll.css

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
body, html {
22
margin: 0;
33
overflow: hidden;
4+
transition: opacity 400ms;
45
-webkit-transition: opacity 400ms;
56
-moz-transition: opacity 400ms;
6-
transition: opacity 400ms;
77
}
88

99
body, .slidescroll-root, html {
@@ -16,6 +16,7 @@ body, .slidescroll-root, html {
1616

1717
.slidescroll-root {
1818
position: relative;
19+
transform-style: preserve-3d;
1920
-webkit-transform-style: preserve-3d;
2021
}
2122

demos/simple_example/bower_components/funkyrobot-angular-slidescroll/angular-slidescroll.js

Lines changed: 35 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,12 @@ app.directive('slidescroll', ['$document', function($document) {
7272
var pos = toSlide * 100;
7373

7474
// Transform to position with ease transition animation
75+
$scope.viewFinderElement.css("transform", "translate3d(0, -" + pos + "%, 0)");
76+
$scope.viewFinderElement.css("transition", "all 800ms ease");
7577
$scope.viewFinderElement.css("-webkit-transform", "translate3d(0, -" + pos + "%, 0)");
7678
$scope.viewFinderElement.css("-webkit-transition", "all 800ms ease");
79+
$scope.viewFinderElement.css("-moz-transform", "translate3d(0, -" + pos + "%, 0)");
80+
$scope.viewFinderElement.css("-moz-transition", "all 800ms ease");
7781
};
7882

7983
this.addSlide = function(slideScope, slideElement) {
@@ -105,21 +109,26 @@ app.directive('slidescroll', ['$document', function($document) {
105109

106110
var inTransition = false;
107111

108-
scope.$on('TransitionEvent', function(event, moveForward, numberSlides) {
109-
// Check arguments
110-
if (typeof moveForward !== 'boolean') {
111-
return;
112-
}
113-
if (typeof numberSlides !== 'number') {
112+
scope.$on('TransitionEvent', function(event, slideDelta) {
113+
// Check argument
114+
slideDelta = parseInt(slideDelta);
115+
if (typeof slideDelta !== 'number') {
114116
return;
115117
}
116118

117119
// Move forward or backward by numberSlides
118-
if (moveForward) {
119-
controller.transformTo(scope.currentSlideIndex + numberSlides);
120-
} else {
121-
controller.transformTo(scope.currentSlideIndex - numberSlides);
120+
controller.transformTo(scope.currentSlideIndex + slideDelta);
121+
});
122+
123+
scope.$on('TransitionToEvent', function(event, slideIndex) {
124+
// Check slideIndex argument
125+
slideIndex = parseInt(slideIndex);
126+
if (typeof slideIndex !== 'number') {
127+
return;
122128
}
129+
130+
// Move controller to slideIndex
131+
controller.transformTo(slideIndex);
123132
});
124133

125134
// Bind keyboard events
@@ -132,37 +141,40 @@ app.directive('slidescroll', ['$document', function($document) {
132141

133142
// Determine transition info
134143
var moveForward = true;
135-
var numberSlides = 0;
144+
var slideDelta = 0;
136145

137146
switch (event.which) {
138-
case 34: // Page down
147+
case 33: // Page up
139148
case 38: // Up key
140149

141-
moveForward = false;
142-
numberSlides = 1;
150+
slideDelta = -1;
143151
break;
144152

145-
case 33: // Page up
153+
case 34: // Page down
146154
case 32: // Spacebar
147155
case 40: // Down arrow
148156

149-
moveForward = true;
150-
numberSlides = 1;
157+
slideDelta = 1;
151158
break;
152159

153160
case 36: // Home key
154161

155162
// Roll backward by the number of slides of the current slide index
156-
moveForward = false;
157-
numberSlides = scope.currentSlideIndex;
163+
slideDelta = scope.currentSlideIndex;
164+
break;
165+
166+
case 35: // End key
167+
168+
// Roll forward by the number of slides of the current slide index
169+
slideDelta = (scope.numSlides - scope.currentSlideIndex) - 1;
158170
break;
159171

160172
default:
161173
return;
162174
}
163175

164176
// Fire transition event to move
165-
scope.$emit('TransitionEvent', moveForward, numberSlides);
177+
scope.$emit('TransitionEvent', slideDelta);
166178

167179
});
168180

@@ -175,13 +187,12 @@ app.directive('slidescroll', ['$document', function($document) {
175187
if (!scope.inTransition && !scope.quietPeriod) {
176188

177189
// Determine if we're going forward or backward
178-
var moveForward = true;
179190
if (event.wheelDelta > 0) {
180-
moveForward = false;
191+
scope.$emit('TransitionEvent', -1);
192+
} else {
193+
scope.$emit('TransitionEvent', 1);
181194
}
182195

183-
scope.$emit('TransitionEvent', moveForward, 1);
184-
185196
}
186197

187198
});
@@ -211,17 +222,12 @@ app.directive('slide', function() {
211222
element.on('$destroy', function() {
212223
slidescrollController.removeSlide(scope.slideNum)
213224
});
214-
215-
element.css('background', 'url(' + scope.backgroundImage + ')');
216225
}
217226

218227
return {
219228
require: "^slidescroll",
220229
transclude: true,
221230
link: link,
222-
scope: {
223-
backgroundImage: '=ssBackgroundImage'
224-
},
225231
template: "<div ng-transclude></div>"
226232
}
227233

demos/simple_example/bower_components/funkyrobot-angular-slidescroll/bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "funkyrobot-angular-slidescroll",
3-
"version": "0.0.5",
3+
"version": "0.0.9",
44
"main": "angular-slidescroll.js",
55
"ignore": [
66
"**/.*",

0 commit comments

Comments
 (0)