Permalink
Browse files

Merge branch 'release/1.2.2'

  • Loading branch information...
2 parents 8705321 + be9d693 commit d3af824e72bf7298a55fa3b84b09450e7509f9ec @beneverard committed Jul 2, 2012
Showing with 35 additions and 7 deletions.
  1. +5 −0 README.md
  2. +22 −2 index.html
  3. +7 −4 js/jquery.jqpagination.js
  4. +1 −1 js/jquery.jqpagination.min.js
View
@@ -10,6 +10,11 @@
## Changelog
+### 1.2.2
+- Fixed: Incorrect GitHub fork ribbon image url
+- Fixed: Added Google Analytics tracker code
+- Fixed: Initial input focus setting undefined value
+
### 1.2.1
- Fixed: callMethod function was failing to call the desired function
View
@@ -26,7 +26,9 @@
</head>
<body>
- <a href="http://github.com/beneverard/jqPagination"><img style="position: absolute; top: 0; right: 0; border: 0; z-index: 123;" src="https://d3nwyuy0nl342s.cloudfront.net/img/7afbc8b248c68eb468279e8c17986ad46549fb71/687474703a2f2f73332e616d617a6f6e6177732e636f6d2f6769746875622f726962626f6e732f666f726b6d655f72696768745f6461726b626c75655f3132313632312e706e67" alt="Fork me on GitHub"></a>
+
+ <a href="http://github.com/beneverard/jqPagination"><img style="position: absolute; top: 0; right: 0; border: 0; z-index: 123;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_darkblue_121621.png" alt="Fork me on GitHub"></a>
+
<div id="header">
<div id="header-wrapper">
<h1>jqPagination</h1>
@@ -100,12 +102,30 @@ <h2 id="feedback">Feedback</h2>
<div id="footer">
<div class="gradient">&nbsp;</div>
<div id="footer-wrapper">
- <p>&copy; Ben Everard 2011</p>
+ <p>&copy; Ben Everard 2012</p>
</div>
</div>
+
+ <!-- analytics -->
+
+ <script type="text/javascript">
+
+ var _gaq = _gaq || [];
+ _gaq.push(['_setAccount', 'UA-6229813-16']);
+ _gaq.push(['_trackPageview']);
+
+ (function() {
+ var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google- analytics.com/ga.js';
+ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+ })();
+
+ </script>
+
<script type="text/javascript" src="http://www.observerapp.com/record.js"></script>
<script type="text/javascript">
try { Observerapp.record("4e57994f9c529e395d014904"); } catch(e) {};
</script>
+
</body>
</html>
View
@@ -77,11 +77,14 @@
// BIND EVENTS
base.$input.on('focus.jqPagination mouseup.jqPagination', function (event) {
-
+
// if event === focus, select all text...
if (event.type === 'focus') {
- var $self = $(this);
- $self.val($self.data('current-page')).select();
+
+ var current_page = parseInt(base.options.current_page, 10);
+
+ $(this).val(current_page).select();
+
}
// if event === mouse up, return false. Fixes Chrome bug
@@ -125,7 +128,7 @@
return false;
}
- // for maintainac + windows (read: other), maintain the cmd + ctrl click for new tab
+ // for mac + windows (read: other), maintain the cmd + ctrl click for new tab
if (!event.metaKey && !event.ctrlKey) {
event.preventDefault();
base.setPage($self.data('action'));

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.

0 comments on commit d3af824

Please sign in to comment.