pagesjs 0.0.2 → 0.0.3

data/ChangeLog

@@ -0,0 +1,11 @@
+== 0.0.3 (Sergey Muravyov-Apostol)
+* Allow to add listener for all new content.
+* Allow to set animation page options in JS.
+* Cache page options to tag data.
+* Fix gemspec issue with Bundler.
+
+== 0.0.2 (Kondraty Ryleyev)
+* Fix Pages.js disabling in onready event.
+
+== 0.0.1 (Pavel Pestel)
+* Initial release.

data/README.md

@@ -57,7 +57,7 @@ For Ruby on Rails you can use gem for Assets Pipeline.
 1. Add `pagesjs` gem to `Gemfile`:
 
    ```ruby
-   gem 'pagesjs'
+   gem "pagesjs"
    ```
 
 2. Install gems:
@@ -110,6 +110,8 @@ by `selector`:
   visible (it is happened when document ready and when URL is changed).
 * `close`: `function ($, $$, page)` which will be called, when page becomes
   hidden (URL changed and another page become to be open).
+* `animation`: `function (prev)` to return animation, depend on previous page.
+  For simple solution use `data-page-animation` attribute in page or link tags.
 
 Callbacks get three arguments:
 

data/vendor/assets/javascripts/pages.js

@@ -33,7 +33,7 @@
   window.Pages = {
 
     // Is history management disabled.
-    disabled: true,
+    disabled: false,
 
     // jQuery node for current page.
     //
@@ -74,14 +74,16 @@
     animations: { },
 
     // Add description for page with `selector`. Allow options:
-    // * `load`:  `function ($, $$, page)` which is called, when page is
-    //            loaded (contained in document or loaded after by AJAX).
-    //            Good place to add events handlers to HTML tags.
-    // * `open`:  `function ($, $$, page)` which is called, when page become
-    //            to be visible (called on document ready and when
-    //            URL is changed).
+    // * `load`: `function ($, $$, page)` which is called, when page is loaded
+    //   (contained in document or loaded after by AJAX).
+    //   Good place to add events handlers to HTML tags.
+    // * `open`: `function ($, $$, page)` which is called, when page become
+    //   to be visible (called on document ready and when URL is changed).
     // * `close`: `function ($, $$, page)` which is called, when page become
-    //            to be hidden (URL changed and another page become to be open).
+    //   to be hidden (URL changed and another page become to be open).
+    // * `animation`: `function (prev)` to return animation, depend on
+    //   previous page. For simple solution use `data-page-animation` attribute
+    //   in page or link tags.
     //
     //   Pages.add('.comments-page', {
     //     load:  function($, $$, page) {
@@ -109,18 +111,32 @@
     //   Pages.add('.comments-page', function($, $$, page) {
     //     $$('.pagination').ajaxPagination();
     //   });
+    //
+    // You can set callback to be runned on every content added to DOM
+    // (for example, to bind events for controls common for all pages).
+    // Just miss `selector`:
+    //
+    //   Pages.add(function($, $$, content) {
+    //     $$('[rel=submit]').click(function() {
+    //       $(this).closest('form').submit();
+    //     });
+    //   });
     add: function(selector, options) {
-      if ( typeof(options) == 'function' ) {
-        options = { load: options };
+      if ( typeof(options) == 'undefined' ) {
+        this._liveCallbacks.push(selector);
+      } else {
+        if ( typeof(options) == 'function' ) {
+          options = { load: options };
+        }
+        options.selector = selector;
+        this._pages.push(options);
       }
-      options.selector = selector;
-      this._pages.push(options);
     },
 
     // Run Pages.js. It’s called automatically on document ready.
     // It’s used for tests.
     init: function() {
-      this._loadEvent($(this._document));
+      this._enlive($(this._document));
       var current = this._findCurrent();
       if ( current.length ) {
         this._setCurrent(current);
@@ -303,6 +319,9 @@
     // Event listeners are already binded.
     _events: false,
 
+    // Callbacks was setted by `Pages.live`.
+    _liveCallbacks: [],
+
     // Find first current page.
     _findCurrent: function() {
       return $(this.pagesSelector + ':visible:first', this._document)
@@ -315,16 +334,22 @@
       };
     },
 
-    // Find pages in new content and trigger load event on them.
-    _loadEvent: function(nodes) {
-      var page, $$;
+    // Find pages in new content, set caches and trigger load event on them.
+    _enlive: function(nodes) {
+      var $$ = this._subfind(nodes);
+      for (var i = 0; i < this._liveCallbacks.length; i++) {
+        this._liveCallbacks[i].call(nodes, $, $$, nodes);
+      }
+
+      var page;
       for (var i = 0; i < this._pages.length; i++) {
         page = this._pages[i];
-        if ( page.load ) {
-          var div = nodes.filter(page.selector);
-          div = div.add( nodes.find(page.selector) );
-          if ( div.length ) {
-            page.load.call(div, $, this._subfind(div), div);
+        var divs = nodes.filter(page.selector);
+        divs = divs.add( nodes.find(page.selector) );
+        if ( divs.length ) {
+          divs.data('page', page);
+          if ( page.load ) {
+            page.load.call(divs, $, this._subfind(divs), divs);
           }
         }
       }
@@ -333,32 +358,16 @@
     // Find page descriptions for current and next page and fire `close` and
     // `open` events.
     _setCurrent: function(next) {
-      var page, $$, currentPage, nextPage, current = this.current;
-      if ( current && current.length ) {
-        for (var i = 0; i < this._pages.length; i++) {
-          page = this._pages[i];
-          if ( page.close ) {
-            if ( current.is(page.selector) ) {
-              currentPage = page;
-              break
-            }
-          }
-        }
-      }
-      for (var i = 0; i < this._pages.length; i++) {
-        page = this._pages[i];
-        if ( page.open ) {
-          if ( next.is(page.selector) ) {
-            nextPage = page;
-            break
-          }
+      var current = this.current;
+      if ( current ) {
+        var currentPage = current.data('page');
+        if ( currentPage && currentPage.close ) {
+          currentPage.close.call(current, $, this._subfind(current), current);
         }
       }
 
-      if ( currentPage ) {
-        currentPage.close.call(current, $, this._subfind(current), current);
-      }
-      if ( nextPage ) {
+      var nextPage = next.data('page');
+      if ( nextPage && nextPage.open ) {
         nextPage.open.call(next, $, this._subfind(next), next);
       }
 
@@ -384,8 +393,13 @@
 
     // Open loaded page.
     _openPage: function(page, data) {
-      data = $.extend(page.data(), data);
-      var anim = data.pageAnimation || Pages.animation;
+      var pageData = page.data();
+      data = $.extend(pageData, data);
+      if ( pageData.page && pageData.page.animation ) {
+        var anim = page.data('page').animation(this.current);
+      } else {
+        var anim = data.pageAnimation || Pages.animation;
+      }
       this.animating.wait(function() {
         if ( typeof(data.title) != 'undefined' ) {
           Pages.title(data.title);
@@ -422,7 +436,7 @@
             data.link.trigger('page-loaded', data);
           }
 
-          Pages._loadEvent(nodes);
+          Pages._enlive(nodes);
           callback(nodes);
         });
     }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pagesjs
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,19 +9,19 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-11 00:00:00.000000000 Z
+date: 2012-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sprockets
-  requirement: &11613200 !ruby/object:Gem::Requirement
+  requirement: &8204980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta.5
+        version: '2'
   type: :runtime
   prerelease: false
-  version_requirements: *11613200
+  version_requirements: *8204980
 description: Pages.js allow you to manage pages JS code and forget about low-level
   History API.
 email:
@@ -31,11 +31,13 @@ extensions: []
 extra_rdoc_files:
 - LICENSE
 - README.md
+- ChangeLog
 files:
 - vendor/assets/javascripts/pages.js
 - lib/pagesjs.rb
 - LICENSE
 - README.md
+- ChangeLog
 homepage: https://github.com/ai/pages.js
 licenses: []
 post_install_message: