Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge with upstream
  • Loading branch information
CuinnWylie committed Mar 4, 2014
2 parents c409ba1 + 58dfb87 commit 1eb52cd
Show file tree
Hide file tree
Showing 77 changed files with 614 additions and 333 deletions.
3 changes: 2 additions & 1 deletion .gitignore
@@ -1,4 +1,5 @@
boilterplate/node_modules
node_modules
.idea
_escaped_fragment_
_escaped_fragment_
report
4 changes: 3 additions & 1 deletion .travis.yml
@@ -1,3 +1,5 @@
language: node_js
node_js:
- 0.8
- 0.10
before_script:
- npm install -g grunt-cli
107 changes: 107 additions & 0 deletions Gruntfile.js
@@ -0,0 +1,107 @@
/*global module:false*/
module.exports = function (grunt) {

grunt.loadNpmTasks('grunt-contrib-jshint');
grunt.loadNpmTasks('grunt-contrib-less');
//grunt.loadNpmTasks('grunt-contrib-qunit');
grunt.loadNpmTasks('grunt-qunit-istanbul');
grunt.loadNpmTasks('grunt-contrib-uglify');


// Project configuration.
grunt.initConfig({
meta:{
version:'1.0.1',
banner:'/*! pager.js - v<%= meta.version %> - ' +
'<%= grunt.template.today("yyyy-mm-dd") %>\n' +
'* http://oscar.finnsson.nu/pagerjs/\n' +
'* Copyright (c) <%= grunt.template.today("yyyy") %> ' +
'Oscar Finnsson; Licensed MIT */'
},
server:{
port:8000,
base:'.'
},
qunit:{
options: {
'--web-security': 'no',
coverage: {
src: ['pager.js'],
instrumentedFiles: 'temp/',
htmlReport: 'report/coverage',
coberturaReport: 'report/',
linesThresholdPct: 85
}
},
files:['test/**/*.html']
},
uglify:{
dist:{
options: {
banner: '<%= meta.banner %>'
},
files: {
'dist/pager.min.js': ['pager.js']
}
},
demo:{
options: {
banner: '<%= meta.banner %>'
},
files: {
'pagerjs.com/demo/pager.min.js': ['pager.js']
}
}
},
watch:{
files:'<config:lint.files>',
tasks:'lint qunit'
},
jshint:{
files: ['pager.js'],
options: {
"curly": true,
"eqeqeq": true,
"immed": true,
"latedef": true,
"newcap": true,
"noarg": true,
"sub": true,
"undef": true,
"boss": true,
"eqnull": true,
"browser": true,
"globals": {
"jQuery": true,
"ko": true,
"$": true,
"define": true,
"_": true
}
}
},
less:{
dist:{
files:{
'dist/pager.css':'pager.less'
}
},
test:{
files:{
'test/pager.css':'pager.less'
}
},
demo:{
files:{
'pagerjs.com/demo/pager.css':'pager.less'
}
}
}
});

// Default task.
grunt.registerTask('default', ['jshint', 'less', 'qunit', 'uglify']);

grunt.registerTask('travis', ['qunit', 'jshint']);

};
25 changes: 20 additions & 5 deletions README.md
Expand Up @@ -15,7 +15,7 @@ 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.
This readme is for version 1.0.1.

## Getting Started

Expand Down Expand Up @@ -134,10 +134,15 @@ Yes. Use `pager.min.history.js` if you want to use it together with History.js.

### 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)
- [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)
- [toJSON refinements](https://github.com/finnsson/pagerjs/pull/129)
- [pagerjs AMD support replies on global $ variable](https://github.com/finnsson/pagerjs/issues/135)
- [withOnShow not updating on navigation](https://github.com/finnsson/pagerjs/issues/143)
- [Added bower.json for dependency installation when pulling in this module.](https://github.com/finnsson/pagerjs/pull/146)
- [Do not overwrite nameParam on view model if it is already defined](https://github.com/finnsson/pagerjs/pull/147)

## Roadmap

Expand All @@ -162,6 +167,16 @@ Fork this repo. Install all dependencies (node.js, grunt, phnatomjs). Run all te

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

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

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

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

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

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

## License

pager.js is under MIT license.
Expand Down
2 changes: 1 addition & 1 deletion bower.json
@@ -1,6 +1,6 @@
{
"name": "pagerjs",
"version": "1.0.0",
"version": "1.0.1",
"homepage": "http://pagerjs.com/",
"authors": [
"Oscar Finnsson <oscar.finnsson@gmail.com>"
Expand Down
20 changes: 10 additions & 10 deletions dist/pager.css
Expand Up @@ -98,18 +98,18 @@
-moz-transition: all 0.3s ease-in-out;
-o-transition: all 0.3s ease-in-out;
transition: all 0.3s ease-in-out;
-webkit-transform: rotatey(90deg) scale(1);
-moz-transform: rotatey(90deg) scale(1);
-ms-transform: rotatey(90deg) scale(1);
-o-transform: rotatey(90deg) scale(1);
transform: rotatey(90deg) scale(1);
-webkit-transform: rotateY(90deg) scale(1);
-moz-transform: rotateY(90deg) scale(1);
-ms-transform: rotateY(90deg) scale(1);
-o-transform: rotateY(90deg) scale(1);
transform: rotateY(90deg) scale(1);
}
.pagerjs-fx-flip-in {
-webkit-transform: rotatey(0deg) scale(1);
-moz-transform: rotatey(0deg) scale(1);
-ms-transform: rotatey(0deg) scale(1);
-o-transform: rotatey(0deg) scale(1);
transform: rotatey(0deg) scale(1);
-webkit-transform: rotateY(0deg) scale(1);
-moz-transform: rotateY(0deg) scale(1);
-ms-transform: rotateY(0deg) scale(1);
-o-transform: rotateY(0deg) scale(1);
transform: rotateY(0deg) scale(1);
}
.pagerjs-fx-popout-modal {
-webkit-transition: all 0.3s ease-in-out;
Expand Down

0 comments on commit 1eb52cd

Please sign in to comment.