Skip to content
This repository was archived by the owner on Nov 15, 2022. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,25 @@ language: node_js
node_js:
- 0.10

before_script:
# Google Chrome
#
# https://github.com/travis-ci/travis-ci/issues/272#issuecomment-14402117
# http://stackoverflow.com/questions/19255976/how-to-make-travis-execute-angular-tests-on-chrome-please-set-env-variable-chr
#
before_install:
- export CHROME_BIN=chromium-browser
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
- npm install -g karma
- npm install -g bower
- npm install -g grunt-cli

install:
- npm install
- bower install

before_script:
- grunt

script:
- karma start --no-auto-watch --single-run --reporters dots --browsers Firefox
- karma start --no-auto-watch --single-run --reporters dots
26 changes: 16 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# angular-slider [![Build Status](https://secure.travis-ci.org/Venturocket/angular-slider.png?branch=master)](http://travis-ci.org/Venturocket/angular-slider)
Slider directive for AngularJS. https://venturocket.github.io/angular-slider
## merged from CrossLead/angular-slider
- Added touch event check in onMove() and onStart()

## modified in fork
- Single knob selection bar (SPAN.bar.unselected.low)

# angular-slider [![Build Status](https://travis-ci.org/JulianWielga/angular-slider.svg?branch=master)](https://travis-ci.org/JulianWielga/angular-slider)
Slider directive for AngularJS. https://julianwielga.github.io/angular-slider
License: MIT

## Features
Expand All @@ -12,16 +18,16 @@ License: MIT
- Full touch event support

## Known Issues
- When hidden during initialization (`display: none;`) the slider might not display correctly when shown. Issue `$scope.$broadcast('refreshSlider');`
in a parent scope to tell the slider to update the DOM.
- The `step` attribute conflicts with angular-foundation's `step` directive ([docs](http://madmimi.github.io/angular-foundation/#/tour)). To remedy this,
use `step-width` instead (it's an alias of `step`). `step` will be deprecated in the next minor release, so if you want to do a bit of future proofing
- When hidden during initialization (`display: none;`) the slider might not display correctly when shown. Issue `$scope.$broadcast('refreshSlider');`
in a parent scope to tell the slider to update the DOM.
- The `step` attribute conflicts with angular-foundation's `step` directive ([docs](http://madmimi.github.io/angular-foundation/#/tour)). To remedy this,
use `step-width` instead (it's an alias of `step`). `step` will be deprecated in the next minor release, so if you want to do a bit of future proofing
you can start using `step-width` now and save yourself a bit of migration work later .

## Installation

```
bower install venturocket-angular-slider
bower install touk-angular-slider
```

## Usage
Expand All @@ -35,10 +41,10 @@ Add `<script>`s to your `html` files for [angular](https://github.com/angular/bo
<script src="build/angular-slider.min.js"></script>
```

And add `vr.directives.slider` as a dependency for your app:
And add `touk.slider` as a dependency for your app:

```javascript
angular.module('myApp', ['vr.directives.slider', ...]);
angular.module('myApp', ['touk.slider', ...]);
```

**NOTE:** in IE10/11 an annoying tooltip will show up unless you add the following css:
Expand Down Expand Up @@ -152,7 +158,7 @@ As an attribute:


## Scaling
You can supply any arbitrary scaling function (and its inverse) to the slider to suit your needs.
You can supply any arbitrary scaling function (and its inverse) to the slider to suit your needs.
The inverse scaling function MUST be specified if a scaling function is specified (and vice versa).
The scaling/inverse function can be pretty much anything as long as they take a number as a parameter and return a number. Like this:
```javascript
Expand Down
56 changes: 27 additions & 29 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,31 +1,29 @@
{
"name": "angular-slider",
"version": "0.3.2",
"main": "./build/angular-slider.js",
"ignore": [
"**/.*",
"node_modules",
"components",
"lib",
"src",
"test",
".g*",
".editorconfig",
".jshintrc",
".travis.yml",
"Gruntfile.js",
"karma.conf.js",
"*.html"
],
"dependencies": {
"angular": "~1.2",
"angular-touch": "~1.2"
},
"devDependencies": {
"angular-mocks": "*",
"angular-scenario": "*"
},
"resolutions": {
"angular": "v1.2.16"
}
"name": "touk-angular-slider",
"version": "0.3.3",
"main": "./build/touk-angular-slider.js",
"ignore": [
"**/.*",
"node_modules",
"components",
"lib",
"src",
"test",
".g*",
".editorconfig",
".jshintrc",
".travis.yml",
"Gruntfile.js",
"karma.conf.js",
"*.html"
],
"dependencies": {
"angular": ">= 1.2 < 1.4",
"angular-touch": ">= 1.2 < 1.4"
},
"devDependencies": {
"angular-mocks": "*",
"angular-scenario": "*",
"jquery": ">= 2.1 < 2.2"
}
}
6 changes: 0 additions & 6 deletions build/angular-slider.min.js

This file was deleted.

Loading