@@ -3,4 +3,4 @@ dist |
||
| 3 | 3 |
.tmp |
| 4 | 4 |
bower_components |
| 5 | 5 |
.DS_Store |
| 6 |
-.ftpass |
|
| 6 |
+.ftppass |
@@ -43,9 +43,9 @@ angular.module('goApp.background', ['famous.angular', 'goApp.data'])
|
||
| 43 | 43 |
|
| 44 | 44 |
$scope.playVideo = function(index){
|
| 45 | 45 |
$scope.current_video_index = index; |
| 46 |
- console.log("switching to video " + index + ": " + $scope.videoList[$scope.current_video_index])
|
|
| 46 |
+ console.log("switching to video " + index + ": " + $scope.videoList[$scope.current_video_index]);
|
|
| 47 | 47 |
$scope.lightbox.show($scope.videoList[$scope.current_video_index]); |
| 48 |
- } |
|
| 48 |
+ }; |
|
| 49 | 49 |
|
| 50 | 50 |
$scope.preload = function() {
|
| 51 | 51 |
$scope.current_video = $scope.videos[0]; |
@@ -70,10 +70,11 @@ angular.module('goApp.background', ['famous.angular', 'goApp.data'])
|
||
| 70 | 70 |
return Math.floor(Math.random()*(max-min+1)+min); |
| 71 | 71 |
}; |
| 72 | 72 |
|
| 73 |
+ |
|
| 74 |
+ |
|
| 73 | 75 |
$scope.createBackgroundVideos = function() {
|
| 74 | 76 |
console.log("> Creating videos:");
|
| 75 | 77 |
for (var i = 0; i < $scope.videos.length; i++) {
|
| 76 |
- $scope.videos[i] |
|
| 77 | 78 |
console.log("> adding video " + $scope.videos[i]);
|
| 78 | 79 |
var video = new VideoSurface({
|
| 79 | 80 |
size: [undefined, undefined], |
@@ -85,11 +86,6 @@ angular.module('goApp.background', ['famous.angular', 'goApp.data'])
|
||
| 85 | 86 |
} |
| 86 | 87 |
}); |
| 87 | 88 |
video.setAttributes({ loop: '' });
|
| 88 |
- var videoModifier = new Modifier(); |
|
| 89 |
- videoModifier.transformFrom(function(){
|
|
| 90 |
- //transform: Transform.translate(0, 0, 0); |
|
| 91 |
- Transform.translate(0, 0, 0); |
|
| 92 |
- }); |
|
| 93 | 89 |
var newView = new View(); |
| 94 | 90 |
newView.add(videoModifier).set(video); |
| 95 | 91 |
$scope.videoList.push(newView); |
@@ -102,7 +98,7 @@ angular.module('goApp.background', ['famous.angular', 'goApp.data'])
|
||
| 102 | 98 |
inOpacity: 1, |
| 103 | 99 |
outOpacity: 1, |
| 104 | 100 |
overlap: false |
| 105 |
- } |
|
| 101 |
+ }; |
|
| 106 | 102 |
$scope.lightbox.setOptions(lightboxOpts); |
| 107 | 103 |
$scope.lightbox.show($scope.videoList[$scope.current_video_index]); |
| 108 | 104 |
$scope.backgroundView.add($scope.lightbox); |
@@ -120,6 +116,10 @@ angular.module('goApp.background', ['famous.angular', 'goApp.data'])
|
||
| 120 | 116 |
|
| 121 | 117 |
$scope.loadBackgroundData(); |
| 122 | 118 |
|
| 123 |
- |
|
| 119 |
+ var videoModifier = new Modifier(); |
|
| 120 |
+ videoModifier.transformFrom(function(){
|
|
| 121 |
+ //transform: Transform.translate(0, 0, 0); |
|
| 122 |
+ Transform.translate(0, 0, 0); |
|
| 123 |
+ }); |
|
| 124 | 124 |
|
| 125 | 125 |
}]); |
@@ -30,11 +30,11 @@ angular.module('goApp.navigation', ['famous.angular', 'ngRoute', 'ngFx', 'ngAnim
|
||
| 30 | 30 |
|
| 31 | 31 |
$scope.hoverLink = function(index) {
|
| 32 | 32 |
$rootScope.$broadcast('change-bg-video', index);
|
| 33 |
- } |
|
| 33 |
+ }; |
|
| 34 | 34 |
|
| 35 | 35 |
$scope.leaveLink = function() {
|
| 36 | 36 |
$rootScope.$broadcast('change-bg-video', 0);
|
| 37 |
- } |
|
| 37 |
+ }; |
|
| 38 | 38 |
|
| 39 | 39 |
$scope.btnNavclick = function(index){
|
| 40 | 40 |
if($scope.navigation[index].link == 'submenu') {
|