Meteor 1.3 update

blueyestar · Apr 1, 2016 · 8168af0 · 8168af0
1 parent f666386
commit 8168af0
Show file tree

Hide file tree

Showing 18 changed files with 109 additions and 89 deletions.
diff --git a/client/controllers.coffee b/client/controllers.coffee
@@ -1,17 +1,5 @@
 global = @
 
-th = Template::helpers
-@_TemplateHelpers = {}
-Template::helpers = (dict) ->
-  global._TemplateHelpers[@viewName.substr 9] = dict
-  th.apply @, arguments
-
-te = Template::events
-@_TemplateEvents = {}
-Template::events = (dict) ->
-  global._TemplateEvents[@viewName.substr 9] = dict
-  te.apply @, arguments
-
 Template._pagesPageCont.helpers
   divWrapper: (self) ->
     !self.table and self.divWrapper
@@ -58,6 +46,7 @@ Template._pagesPage.helpers
 
 Template._pagesNav.helpers
   show: ->
+    console.log Template.parentData(), Template.instance()
     @fastRender or (not @infinite and 1 < @sess "totalPages")
   link: ->
     self = @_p

diff --git a/client/templates.html b/client/templates.html
@@ -1,7 +1,3 @@
-<template name="pages">
-</template>
-<template name="pagesNav">
-</template>
 <template name="_pagesLoading">
   <div class="pagesLoadingDefaultCont">
     <div class="pagesLoadingDefault"><img src="/packages/alethes_pages/public/loader.gif"/></div>

diff --git a/examples/basic/.meteor/.finished-upgraders b/examples/basic/.meteor/.finished-upgraders
@@ -5,3 +5,9 @@
 notices-for-0.9.0
 notices-for-0.9.1
 0.9.4-platform-file
+notices-for-facebook-graph-api-2
+1.2.0-standard-minifiers-package
+1.2.0-meteor-platform-split
+1.2.0-cordova-changes
+1.2.0-breaking-changes
+1.3.0-split-minifiers-package
diff --git a/examples/basic/.meteor/packages b/examples/basic/.meteor/packages
@@ -3,6 +3,20 @@
 # 'meteor add' and 'meteor remove' will edit this file for you,
 # but you can also edit it by hand.
 
-meteor-platform
 coffeescript
 alethes:pages
+meteor-base
+mobile-experience
+mongo
+blaze-html-templates
+session
+jquery
+tracker
+logging
+reload
+random
+ejson
+spacebars
+check
+standard-minifier-css
+standard-minifier-js
diff --git a/examples/basic/.meteor/release b/examples/basic/.meteor/release
@@ -1 +1 @@
-METEOR@1.0.3.1
+METEOR@1.3
diff --git a/examples/basic/.meteor/versions b/examples/basic/.meteor/versions
@@ -1,50 +1,71 @@
-alethes:[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
+alethes:[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
diff --git a/examples/basic/packages/alethes:pages b/examples/basic/packages/alethes:pages
diff --git a/examples/changePerPage/packages/alethes:pages b/examples/changePerPage/packages/alethes:pages
diff --git a/examples/grounddb/packages/alethes:pages b/examples/grounddb/packages/alethes:pages
diff --git a/examples/infinite/packages/alethes:pages b/examples/infinite/packages/alethes:pages
diff --git a/examples/iron-router/packages/alethes:pages b/examples/iron-router/packages/alethes:pages
diff --git a/examples/multi-collection/packages/alethes:pages b/examples/multi-collection/packages/alethes:pages
diff --git a/examples/table/packages/alethes:pages b/examples/table/packages/alethes:pages
diff --git a/examples/test/packages/meteor-cucumber b/examples/test/packages/meteor-cucumber
diff --git a/examples/test/packages/meteor-webdriver b/examples/test/packages/meteor-webdriver
diff --git a/lib/pages.coffee b/lib/pages.coffee
@@ -8,7 +8,7 @@
     divWrapper: [true, Match.OneOf(
       Match.Optional(String)
       Match.Optional(Boolean)
-    ), "pagesCont"] #If defined, should be a name of the wrapper's CSS classname
+    ), "pagesCont"] #If defined, should be the wrapper's CSS classname
     fields: [true, Object, {}]
     filters: [true, Object, {}]
     itemTemplate: [true, String, "_pagesItemDefault"]
@@ -164,6 +164,7 @@
       Meteor.userId?()
       @countPages()
       @reload()
+    @templateName ?= @name
     Template[@templateName].onRendered =>
       @setInfiniteTrigger() if @infinite
 
@@ -428,7 +429,7 @@
 
     # Create a collection based on the instance's unique id
 
-    #@PaginatedCollection = new Mongo.Collection @id
+    # @PaginatedCollection = new Mongo.Collection @id
 
   linkTo: (page)->
     if Router.current()?.params
@@ -507,15 +508,15 @@
     if @table and @itemTemplate is "_pagesItemDefault"
       @itemTemplate = @tableItemTemplate
 
-    # Create a set of template prefixed by the unique id of this pagination instance
-    # The helper and events are set to those of the base versions of those templates (captured by controllers.coffee)
-
     for i in [@navTemplate, @pageTemplate, @itemTemplate, @tableTemplate]
       tn = @id + i
       Template[tn] = new Blaze.Template "Template.#{tn}", Template[i].renderFunction
-      Template[tn].helpers _TemplateHelpers[i]
-      Template[tn].events _TemplateEvents[i]
-      Template[tn].helpers pagesData: @
+      Template[tn].__eventMaps = Template[tn].__eventMaps.concat Template[i].__eventMaps
+      helpers = pagesData: @
+      _.each Template[i].__helpers, (helper, name) =>
+        if name[0] is " "
+          helpers[name.slice(1)] = _.bind helper, @ 
+      Template[tn].helpers helpers
 
     # Set our helpers on the main template set for this pagination  
 

diff --git a/package.js b/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   "name": "alethes:pages",
   "summary": "State of the art, out of the box Meteor pagination",
-  "version": "1.8.4",
+  "version": "1.8.5",
   "git": "https://github.com/alethes/meteor-pages"
 });
 
@@ -32,9 +32,12 @@ Package.onUse(function(api){
     api.addFiles([
         "client/templates.html",
         "client/controllers.coffee",
-        "client/main.css",
-        "public/loader.gif"
+        "client/main.css"
     ], "client");
+
+    api.addAssets([
+        "public/loader.gif"
+    ], ["client"]);
 });
 
 Package.onTest(function(api){

diff --git a/pages b/pages