feat($scroller): allow desktop scrolling

ajoslin · Jul 25, 2013 · 8249eaf · 8249eaf
1 parent 70da3b5
commit 8249eaf
Show file tree

Hide file tree

Showing 13 changed files with 26,785 additions and 112 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,5 @@
 node_modules
 bower_components
-npm-debug.log
 dist
+*.log
 
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -88,7 +88,7 @@ module.exports = function(grunt) {
         title: 'angular-scrolly',
         navTemplate: 'docs/html/nav.html',
         scripts: [
-          'docs/js/angular-1.1.4.js',
+          'lib/angular.js',
           'dist/angular-scrolly.js'
         ],
         styles: [

diff --git a/bower.json b/bower.json
@@ -17,11 +17,5 @@
     "package.json",
     "src",
     "test"
-  ],
-  "devDependencies": {
-    "angular-mocks": "~1.0.7",
-    "angular-unstable": "~1.1.4",
-    "jquery": "~2.0.1",
-    "angular": "~1.0.7"
-  }
+  ]
 }
diff --git a/demo/index.html b/demo/index.html
@@ -3,7 +3,7 @@
 <head>
 <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"/>
 <meta name="apple-mobile-web-app-capable" content="yes" />
-<script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.0.6/angular.min.js"></script>
+<script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.1.5/angular.min.js"></script>
 <script src="../grunt-scripts/angular-scrolly.js"></script>
 </head>
 <body ng-controller="AppCtrl">

diff --git a/test/angular-mocks-1.1.5.js → lib/angular-mocks.js b/test/angular-mocks-1.1.5.js → lib/angular-mocks.js