Skip to content
This repository has been archived by the owner on Dec 23, 2018. It is now read-only.

Commit

Permalink
Merge pull request #23 from adzialocha/chore/angular-version-update
Browse files Browse the repository at this point in the history
Chore: Angular 1.6 version update
  • Loading branch information
adzialocha authored Mar 13, 2017
2 parents 8aa3053 + 8bd298d commit 3aaa613
Show file tree
Hide file tree
Showing 8 changed files with 17 additions and 24 deletions.
3 changes: 0 additions & 3 deletions Gruntfile.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
'use strict';

module.exports = function (grunt) {

// load all grunt tasks
require('load-grunt-tasks')(grunt);

grunt.initConfig({

// configurable paths

yeoman: {
app: 'src',
dist: 'dist'
Expand Down
4 changes: 2 additions & 2 deletions LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)
The MIT License

Copyright (c) <2014> marmorkuchen.net
Copyright (c) 2010-2017 Google, Inc. http://angularjs.org

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
angular-swipe
=============

Simple vertical/horizontal swipe gesture directives and a swipe service for angular js >= 1.5. Small extension of the existing angular $swipe service.
Simple vertical/horizontal swipe gesture directives and a swipe service for angular js >= 1.6. Small extension of the existing angular $swipe service.

## Install

+ Add this line to your *bower.json* dependencies and run *bower install* afterwards.

>
``` JavaScript
"angular-swipe": "~0.2.0"
"angular-swipe": "~0.2.1"
```

+ Include the required source file (this path or similar)
Expand Down Expand Up @@ -52,9 +52,9 @@ angular.module('app', ['swipe']);
>
```html
<div class="page" ng-controller="AppCtrl">
<div class="container" ng-swipe-up="swipe($event)">
<h1>Swipe me up!</h1>
</div>
<div class="container" ng-swipe-up="swipe($event)">
<h1>Swipe me up!</h1>
</div>
</div>
```

Expand All @@ -72,4 +72,4 @@ app.controller('AppCtrl', function AppCtrl($scope) {

* ng-swipe-up and ng-swipe-down uses preventDefault when you start swiping. This prevents clicks from giving focus to input fields. Adding a `noPreventDefault` class to these elements will not preventDefault when the swipe start on them and thus allow clicks to work.

* When embedding a Google map you might want to prevent a swipe event specifically inside the map. You can do that by adding the `noStartDrag` class to the Google map HTML element
* When embedding a Google map you might want to prevent a swipe event specifically inside the map. You can do that by adding the `noStartDrag` class to the Google map HTML element
4 changes: 2 additions & 2 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "angular-swipe",
"description": "Simple vertical and horizontal swipe gesture directive for angular js",
"version": "0.2.0",
"version": "0.2.1",
"authors": [
"marmorkuchen.net <andreas@marmorkuchen.net>"
],
Expand All @@ -23,7 +23,7 @@
],
"main": "./dist/angular-swipe.js",
"dependencies": {
"angular": "~1.5.x"
"angular": "~1.6.x"
},
"ignore": [
".jshintrc",
Expand Down
4 changes: 1 addition & 3 deletions dist/angular-swipe.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
(function(window, angular, undefined) {

'use strict';

/* global -ngSwipe */
Expand Down Expand Up @@ -232,5 +231,4 @@
makeSwipeDirective('ngSwipeDown', 1, true, 'swipedown');

makeSwipeDirective('ngTap', 1, null, 'tap');

})(window, window.angular);
})(window, window.angular);
4 changes: 2 additions & 2 deletions dist/angular-swipe.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "angular-swipe",
"version": "0.2.0",
"version": "0.2.1",
"dependencies": {},
"devDependencies": {
"grunt": "^1.0.1",
Expand All @@ -9,9 +9,9 @@
"grunt-contrib-connect": "^1.0.2",
"grunt-contrib-copy": "^1.0.0",
"grunt-contrib-jshint": "^1.1.0",
"grunt-contrib-uglify": "^2.0.0",
"grunt-contrib-uglify": "^2.2.0",
"grunt-contrib-watch": "^1.0.0",
"grunt-mocha": "^1.0.2",
"grunt-mocha": "^1.0.4",
"load-grunt-tasks": "^3.5.2"
},
"engines": {
Expand Down
4 changes: 1 addition & 3 deletions src/angular-swipe.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
(function(window, angular, undefined) {

'use strict';

/* global -ngSwipe */
Expand Down Expand Up @@ -232,5 +231,4 @@
makeSwipeDirective('ngSwipeDown', 1, true, 'swipedown');

makeSwipeDirective('ngTap', 1, null, 'tap');

})(window, window.angular);
})(window, window.angular);

0 comments on commit 3aaa613

Please sign in to comment.