pagesjs 0.0.3 → 0.0.4

data/ChangeLog

@@ -1,3 +1,9 @@
+== 0.0.4 (Mikhail Bestuzhev-Ryumin)
+* Allow to set several page options for one page.
+* Set empty jQuery object to Pages.current on load.
+* Remove non-ASCII symbols from gemspec.
+* Print testing URL in test task.
+
 == 0.0.3 (Sergey Muravyov-Apostol)
 * Allow to add listener for all new content.
 * Allow to set animation page options in JS.

data/vendor/assets/javascripts/pages.js

@@ -38,7 +38,7 @@
     // jQuery node for current page.
     //
     //   if ( Pages.current.is('.comments-page') ) { … }
-    current: null,
+    current: $(),
 
     // Selector to find page blocks. Use to find loaded pages and detect
     // current one.
@@ -327,50 +327,66 @@
       return $(this.pagesSelector + ':visible:first', this._document)
     },
 
-    // Return `$$(selector)` function, which is analog of `$(selector, nodes)`.
-    _subfind: function(nodes) {
-      return function(subselector) {
-        return $(subselector, nodes);
-      };
-    },
-
     // Find pages in new content, set caches and trigger load event on them.
     _enlive: function(nodes) {
-      var $$ = this._subfind(nodes);
+      var args = this._callbackArgs(divs)
       for (var i = 0; i < this._liveCallbacks.length; i++) {
-        this._liveCallbacks[i].call(nodes, $, $$, nodes);
+        this._liveCallbacks[i].apply(nodes, args);
       }
 
-      var page;
+      var page, pages;
       for (var i = 0; i < this._pages.length; i++) {
         page = this._pages[i];
         var divs = nodes.filter(page.selector);
         divs = divs.add( nodes.find(page.selector) );
         if ( divs.length ) {
-          divs.data('page', page);
+          pages = divs.data('pages')
+          if ( pages ) {
+            pages.push(page);
+          } else {
+            divs.data('pages', [page]);
+          }
           if ( page.load ) {
-            page.load.call(divs, $, this._subfind(divs), divs);
+            page.load.apply(divs, this._callbackArgs(divs));
           }
         }
       }
     },
 
-    // Find page descriptions for current and next page and fire `close` and
-    // `open` events.
-    _setCurrent: function(next) {
-      var current = this.current;
-      if ( current ) {
-        var currentPage = current.data('page');
-        if ( currentPage && currentPage.close ) {
-          currentPage.close.call(current, $, this._subfind(current), current);
-        }
+    // Return callback arguments.
+    _callbackArgs: function(nodes) {
+      var $$ = function(subselector) {
+        return $(subselector, nodes);
+      };
+      return [$,  $$, nodes];
+    },
+
+    // Run _type_ callback on every pages in _div_.
+    _callback: function(div, type, args) {
+      if ( !div ) {
+        return;
       }
 
-      var nextPage = next.data('page');
-      if ( nextPage && nextPage.open ) {
-        nextPage.open.call(next, $, this._subfind(next), next);
+      var page, pages = div.data('pages')
+      if ( !pages ) {
+        return;
       }
 
+      for (var i = 0; i < pages.length; i++) {
+        page = pages[i];
+        if ( page[type] ) {
+          page[type].apply(div, this._callbackArgs(div));
+        }
+      }
+    },
+
+    // Find page descriptions for current and next page and fire `close` and
+    // `open` events.
+    _setCurrent: function(next) {
+      if ( this.current ) {
+        this._callback(this.current, 'close');
+      }
+      this._callback(next, 'open');
       this.current = next;
     },
 
@@ -393,13 +409,24 @@
 
     // Open loaded page.
     _openPage: function(page, data) {
-      var pageData = page.data();
+      var anim, pageData = page.data();
       data = $.extend(pageData, data);
-      if ( pageData.page && pageData.page.animation ) {
-        var anim = page.data('page').animation(this.current);
+
+      if ( data.pageAnimation ) {
+        anim = data.pageAnimation;
       } else {
-        var anim = data.pageAnimation || Pages.animation;
+        var pageAnimation = null;
+        if ( pageData.pages ) {
+          for (var i = 0; i < pageData.pages.length; i++) {
+            pageAnimation = pageData.pages[i].animation;
+          }
+        }
+        if ( pageAnimation ) {
+          anim = pageAnimation(this.current);
+        }
       }
+      anim = anim || Pages.animation;
+
       this.animating.wait(function() {
         if ( typeof(data.title) != 'undefined' ) {
           Pages.title(data.title);

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: pagesjs
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
-- Andrey “A.I.” Sitnik
+- Andrey "A.I." Sitnik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-21 00:00:00.000000000 Z
+date: 2012-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sprockets
-  requirement: &8204980 !ruby/object:Gem::Requirement
+  requirement: &20932360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '2'
   type: :runtime
   prerelease: false
-  version_requirements: *8204980
+  version_requirements: *20932360
 description: Pages.js allow you to manage pages JS code and forget about low-level
   History API.
 email:
@@ -61,5 +61,5 @@ rubyforge_project:
 rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
-summary: Pages.js – is a framework for History pushState.
+summary: Pages.js - is a framework for History pushState.
 test_files: []