Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
Conflicts:
	pager.js
  • Loading branch information
CuinnWylie committed Jul 15, 2013
2 parents 3093581 + 9b1bb00 commit 6bf2476
Show file tree
Hide file tree
Showing 133 changed files with 4,843 additions and 305 deletions.
29 changes: 28 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

[![Build Status](https://travis-ci.org/finnsson/pagerjs.png)](https://travis-ci.org/finnsson/pagerjs)

![Logo](logo-512.png)

one having or covering a specified number or kind of pages
- Merriam-Webster

Expand All @@ -13,14 +15,18 @@ developed standalone but still communicate between each other.

This makes it easier to design very large scale single page web sites.

This readme is for version 1.0.0.
This readme is for version 1.0.

## Getting Started

See the [demo](http://pagerjs.com/demo/).

## Install

Download



Using npm

npm install pagerjs
Expand Down Expand Up @@ -126,6 +132,13 @@ Yes. Use `pager.min.history.js` if you want to use it together with History.js.

- A lot of cleanup and some breaking changes!

### 1.0.1

-[Work with Knockout 2.3](https://github.com/finnsson/pagerjs/issues/127)
-[hash urls](https://github.com/finnsson/pagerjs/issues/123)
-[withOnShow is not updating route after source is loaded](https://github.com/finnsson/pagerjs/issues/121)
-[Show/Hide Events event don't occur](https://github.com/finnsson/pagerjs/issues/131)

## Roadmap

See [Milestones](https://github.com/finnsson/pagerjs/issues/milestones).
Expand All @@ -135,6 +148,20 @@ See [Milestones](https://github.com/finnsson/pagerjs/issues/milestones).
Fork this repo. Install all dependencies (node.js, grunt, phnatomjs). Run all tests
(`grunt qunit`). Run jslint (`grunt lint`). Make your changes. Run all tests and the linter again. Send a pull request.

### Contributors

[finnsson](https://github.com/finnsson)

[GilesBradshaw](https://github.com/GilesBradshaw)

[tedsteen](https://github.com/tedsteen)

[Shildrak](https://github.com/Shildrak)

[adimkov](https://github.com/adimkov)

[imrefazekas](https://github.com/imrefazekas)

## License

pager.js is under MIT license.
Expand Down
4 changes: 2 additions & 2 deletions dist/pager.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion grunt.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ module.exports = function (grunt) {
// Project configuration.
grunt.initConfig({
meta:{
version:'1.1.0',
version:'1.0.1',
banner:'/*! pager.js - v<%= meta.version %> - ' +
'<%= grunt.template.today("yyyy-mm-dd") %>\n' +
'* http://oscar.finnsson.nu/pagerjs/\n' +
Expand Down
6 changes: 6 additions & 0 deletions lib/jquery-2.0.3.min.js

Large diffs are not rendered by default.

9 changes: 9 additions & 0 deletions lib/jquery.ba-hashchange.min-1.8.js

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

Loading

0 comments on commit 6bf2476

Please sign in to comment.