Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Modifications for version 1.4.2
  • Loading branch information
josecebe committed Jul 23, 2018
1 parent 257054d commit 4dfd38b
Show file tree
Hide file tree
Showing 14 changed files with 146 additions and 169 deletions.
3 changes: 2 additions & 1 deletion .gitignore
@@ -1,4 +1,5 @@
.idea/
*.iml
bower_components
node_modules
node_modules
package-lock.json
14 changes: 7 additions & 7 deletions LICENSE
@@ -1,13 +1,13 @@
Copyright 2014-2015 © Eugene Simakin
Copyright 2014-2018 © Eugene Simakin

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -23,4 +23,4 @@ For development use grunt build to make minified file.
To use grunt install packages by using: npm install

## Demo and Docs
For more information see [docs on github pages](http://esimakin.github.io/twbs-pagination/) (not completed yet)
For more information see [docs on github pages](http://esimakin.github.io/twbs-pagination/) (not completed yet)
3 changes: 2 additions & 1 deletion bower.json
@@ -1,8 +1,9 @@
{
"name": "twbs-pagination",
"version": "1.4.1",
"version": "1.4.2",
"homepage": "https://github.com/esimakin/twbs-pagination",
"authors": [
"Jose Cebellán <josecebe@gmail.com>",
"Eugene Simakin <eugenesimakin@mail.ru>"
],
"description": "jQuery simple pagination plugin for bootstrap-style webpages",
Expand Down
31 changes: 31 additions & 0 deletions examples/bootstrap-v3.html
@@ -0,0 +1,31 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>jQuery Pagination plugin</title>
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
<script src="https://code.jquery.com/jquery-3.3.1.min.js"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
<script src="../jquery.twbsPagination.js" type="text/javascript"></script>
</head>
<body>
<div class="container">
<nav aria-label="Page navigation">
<ul class="pagination" id="pagination"></ul>
</nav>
</div>
<script type="text/javascript">
$(function () {
window.pagObj = $('#pagination').twbsPagination({
totalPages: 35,
visiblePages: 10,
onPageClick: function (event, page) {
console.info(page + ' (from options)');
}
}).on('page', function (event, page) {
console.info(page + ' (from event listening)');
});
});
</script>
</body>
</html>
31 changes: 0 additions & 31 deletions examples/bootstrap-v4.html

This file was deleted.

8 changes: 4 additions & 4 deletions examples/index.html
Expand Up @@ -3,9 +3,9 @@
<head>
<meta charset="UTF-8">
<title>jQuery Pagination plugin</title>
<link href="//netdna.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet">
<script src="//code.jquery.com/jquery-2.0.3.min.js" type="text/javascript"></script>
<script src="//netdna.bootstrapcdn.com/bootstrap/3.0.3/js/bootstrap.min.js"></script>
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.2/css/bootstrap.min.css">
<script src="https://code.jquery.com/jquery-3.3.1.min.js"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.2/js/bootstrap.min.js"></script>
<script src="../jquery.twbsPagination.js" type="text/javascript"></script>
</head>
<body>
Expand All @@ -28,4 +28,4 @@
});
</script>
</body>
</html>
</html>
6 changes: 3 additions & 3 deletions jquery.twbsPagination.js
@@ -1,8 +1,8 @@
/*!
* jQuery pagination plugin v1.4.1
* jQuery pagination plugin v1.4.2
* http://esimakin.github.io/twbs-pagination/
*
* Copyright 2014-2016, Eugene Simakin
* Copyright 2014-2018, Eugene Simakin
* Released under Apache 2.0 license
* http://apache.org/licenses/LICENSE-2.0.html
*/
Expand Down Expand Up @@ -332,6 +332,6 @@
return this;
};

$.fn.twbsPagination.version = "1.4.1";
$.fn.twbsPagination.version = "1.4.2";

})(window.jQuery, window, document);
12 changes: 6 additions & 6 deletions package.json
@@ -1,7 +1,7 @@
{
"name": "twbs-pagination",
"nativeName": "jQuery Bootstrap Pagination",
"version": "1.4.1",
"version": "1.4.2",
"homepage": "https://github.com/esimakin/twbs-pagination",
"author": "Eugene Simakin <john-24@list.ru>",
"description": "jQuery simple pagination plugin for bootstrap-style webpages",
Expand All @@ -10,11 +10,11 @@
"jquery": ">=1.7"
},
"devDependencies": {
"grunt": "^1.0.1",
"grunt-cli": "~1.2.0",
"grunt-contrib-watch": "~1.0.0",
"grunt-contrib-uglify": "^2.0.0",
"load-grunt-tasks": "^3.1.0"
"grunt": "1.0.3",
"grunt-cli": "1.2.0",
"grunt-contrib-uglify": "3.3.0",
"grunt-contrib-watch": "1.1.0",
"load-grunt-tasks": "4.0.0"
},
"repository": {
"type": "git",
Expand Down
5 changes: 2 additions & 3 deletions tests/index.html
Expand Up @@ -5,7 +5,6 @@
<title>All tests</title>
</head>
<body>
<iframe src="run-test-jquery-1.8.1.html" width="100%" height="480px"></iframe>
<iframe src="run-test-jquery-latest.html" width="100%" height="480px"></iframe>
<iframe src="run-test-jquery-latest.html" width="100%" height="800px"></iframe>
</body>
</html>
</html>
22 changes: 0 additions & 22 deletions tests/run-test-jquery-1.8.1.html

This file was deleted.

9 changes: 4 additions & 5 deletions tests/run-test-jquery-latest.html
Expand Up @@ -4,18 +4,17 @@
<meta charset="utf-8">
<title>Tests</title>

<link rel="stylesheet" href="http://code.jquery.com/qunit/qunit-1.13.0.css">
<link rel="stylesheet" href="https://code.jquery.com/qunit/qunit-2.6.1.css">

<script src="http://code.jquery.com/jquery-3.1.1.min.js" type="text/javascript"></script>
<script src="https://code.jquery.com/jquery-3.3.1.min.js" type="text/javascript"></script>
<script src="https://code.jquery.com/qunit/qunit-2.6.1.js" type="text/javascript"></script>
<script src="../jquery.twbsPagination.js" type="text/javascript"></script>

</head>
<body>
<div id="qunit"></div>
<div id="qunit-fixture"></div>
<ul id="pagination" style="display: none;"></ul>

<script src="http://code.jquery.com/qunit/qunit-1.13.0.js"></script>
<script src="./test.js"></script>
</body>
</html>
</html>

0 comments on commit 4dfd38b

Please sign in to comment.