pagesjs 0.0.4 → 0.0.5

data/ChangeLog

@@ -1,3 +1,10 @@
+== 0.0.5 (Pyotr Kakhovsky)
+* Add data.from with URL changing source.
+* Pages.open() will change URL if it necessary.
+* Don’t track location hash changes.
+* Don’t run animation, when page wasn’t be changed.
+* Use lib/assets path in gem instead of vendor/assets.
+
 == 0.0.4 (Mikhail Bestuzhev-Ryumin)
 * Allow to set several page options for one page.
 * Set empty jQuery object to Pages.current on load.

data/{vendor → lib}/assets/javascripts/pages.js

@@ -162,8 +162,8 @@
       this._events = true;
 
       $(window).on('popstate.pages', function() {
-        if ( Pages._lastUrl != location.href ) {
-          Pages.open(location.pathname);
+        if ( Pages._lastUrl != location.pathname ) {
+          Pages.open(location.pathname, { from: 'popstate' });
         }
       });
 
@@ -174,7 +174,7 @@
       return true;
     },
 
-    // Disable session history management. Pages will load by default browser
+    // Disable session history management. Pages.js will load by default browser
     // way without AJAX and animations.
     disable: function() {
       $(this._document).off('click.pages', 'a');
@@ -184,15 +184,22 @@
     },
 
     // Show page by `url` with overrided page `data`. Return true if page is
-    // already loaded and false if Pages request it from server.
+    // already loaded and false if Pages.js request it from server.
     //
     //   setTimeout(function() {
     //     Pages.open('/gameover');
     //   }, 5000);
     open: function(url, data) {
+      if ( location.pathname != url ) {
+        history.pushState({ }, '', url);
+      }
+
       if ( typeof(data) == 'undefined' ) {
         data = { };
       }
+      if ( typeof(data.from) == 'undefined' ) {
+        data.from = 'js';
+      }
       data.url = url;
       Pages._lastUrl = url;
 
@@ -400,15 +407,28 @@
         return true;
       }
 
-      history.pushState({ }, '', href);
-      var data = link.data();
+      var data  = link.data();
       data.link = link;
-      this.open(href, data);
+      data.from = 'link';
+
+      href = href.split('#', 2);
+      var path = href[0];
+      var hash = href[1];
+
+      this.open(path, data);
+      if ( hash && location.hash != hash ) {
+        location.hash = hash;
+      }
       return false;
     },
 
     // Open loaded page.
     _openPage: function(page, data) {
+      if ( page[0] == Pages.current[0] ) {
+        Pages._setCurrent(page);
+        return;
+      }
+
       var anim, pageData = page.data();
       data = $.extend(pageData, data);
 
@@ -494,7 +514,7 @@
   };
 
   $(document).ready(function() {
-    Pages._lastUrl = location.href;
+    Pages._lastUrl = location.pathname;
     Pages.init();
     if ( !Pages.disabled ) {
       Pages.enable();

data/lib/pagesjs.rb

@@ -1,4 +1,4 @@
-# Used only for Ruby on Rails gem to tell, that gem contain `vendor/assets` with
+# Used only for Ruby on Rails gem to tell, that gem contain `lib/assets` with
 # pages.js file.
 module PagesJs
   module Rails

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pagesjs
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-29 00:00:00.000000000 Z
+date: 2012-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sprockets
-  requirement: &20932360 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,12 @@ dependencies:
         version: '2'
   type: :runtime
   prerelease: false
-  version_requirements: *20932360
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2'
 description: Pages.js allow you to manage pages JS code and forget about low-level
   History API.
 email:
@@ -33,7 +38,7 @@ extra_rdoc_files:
 - README.md
 - ChangeLog
 files:
-- vendor/assets/javascripts/pages.js
+- lib/assets/javascripts/pages.js
 - lib/pagesjs.rb
 - LICENSE
 - README.md
@@ -58,7 +63,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Pages.js - is a framework for History pushState.