add snSkrollr config and initialisation

thisissoon · Feb 3, 2015 · 62c70e8 · 62c70e8
1 parent 1b32a56
commit 62c70e8
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 3 deletions.
diff --git a/app/index.html b/app/index.html
@@ -59,6 +59,7 @@
         <script src="components/angular-addthis/dist/angular-addthis.js"></script>
         <script src="components/velocity/velocity.js"></script>
         <script src="components/angular-velocity-animate/dist/angular-velocity.js"></script>
+        <script src="components/skrollr/dist/skrollr.min.js"></script>
         <script src="components/angular-skrollr/dist/angular-skrollr.js"></script>
 
         <script src="js/soon-ui/app.js"></script>

diff --git a/app/js/thisissoon-core/app.js b/app/js/thisissoon-core/app.js
@@ -29,13 +29,16 @@ angular.module("thisissoon.core", [
 .run([
     "$rootScope",
     "CacheService",
+    "snSkrollr",
     "ENV",
     /**
      * @constructor
      * @param {Service} $rootScope
      * @param {Service} CacheService
      */
-    function ($rootScope, CacheService, ENV) {
+    function ($rootScope, CacheService, snSkrollr, ENV) {
+
+        snSkrollr.init();
 
         $rootScope.cache = CacheService;
         $rootScope.env = ENV;

diff --git a/app/js/thisissoon-core/config.js b/app/js/thisissoon-core/config.js
@@ -7,12 +7,20 @@
 angular.module("thisissoon.core").config([
     "$routeProvider",
     "$httpProvider",
+    "snSkrollrProvider",
     /**
      * @constructor
      * @param {Service} $routeProvider
      * @param {Service} $httpProvider
      */
-    function ($routeProvider, $httpProvider) {
+    function ($routeProvider, $httpProvider, snSkrollrProvider) {
+
+        snSkrollrProvider.init = {
+            forceHeight: false,
+            smoothScrolling: true,
+            mobileDeceleration: 0.004
+        };
+
 
         $httpProvider.defaults.cache = false;
 

diff --git a/bower.json b/bower.json
@@ -15,7 +15,8 @@
     "velocity": "1.2.1",
     "angular-scroll": "0.6.4",
     "angular-velocity-animate": "~0.0.1",
-    "angular-skrollr": "~0.0.1"
+    "angular-skrollr": "~0.0.1",
+    "skrollr": "~0.6.29"
   },
   "devDependencies": {
     "angular-mocks": "1.3.8"

diff --git a/scripts.json b/scripts.json
@@ -7,6 +7,7 @@
         "app/components/angular-scroll/angular-scroll.js",
         "app/components/velocity/velocity.js",
         "app/components/angular-velocity-animate/dist/angular-velocity.js",
+        "app/components/skrollr/dist/skrollr.min.js",
         "app/components/angular-skrollr/dist/angular-skrollr.js",
         "app/js/soon-ui/app.js",
         "app/js/soon-ui/directives/fixed.js",