Merge branch 'master' of github.com:gadicohen/meteor-messageformat

Conflicts:
	lib/mfPkg/messageformat-client.js
	package.js
	versions.json

Author: gadicc

History.md

@@ -1,6 +1,6 @@
 ## vNEXT
 
-## v0.0.46
+## v0.0.47
 
 * Bump iron-router to 1.0.0, work with that release, and make it a weak dep
 

README.md

@@ -2,6 +2,8 @@
 
 MessageFormat support, the Meteor way.
 
+For iron:router < 1.0.0, use messageformat v0.0.45.
+
 For Meteor < 0.8.0, use messageformat v0.0.26.
 
 Easy reactive use of complicated strings (gender, plural, etc) with insanely

lib/mfPkg/messageformat-client.js

@@ -18,16 +18,18 @@ mfPkg.mfHelper = function(key, message, params) {
 };
 UI.registerHelper('mf', mfPkg.mfHelper);
 
-Template.mf.helper = function(component, options) {
-	var dep = mfPkg.updated();
-	var key = this.KEY;
-	if(typeof(UI.toRawText) == "function") //0.8.2 compat
-		var message = UI.toRawText(component);
-	else{
-		var message = Blaze._toText ? Blaze._toText(component, HTML.TEXTMODE.STRING) : Blaze.toText(component, HTML.TEXTMODE.STRING);
+Template.mf.helpers({
+	helper: function(component, options) {
+		var dep = mfPkg.updated();
+		var key = this.KEY;
+		if(typeof(UI.toRawText) == "function") //0.8.2 compat
+			var message = UI.toRawText(component);
+		else{
+			var message = Blaze._toText ? Blaze._toText(component, HTML.TEXTMODE.STRING) : Blaze.toText(component, HTML.TEXTMODE.STRING);
+		}
+		return mf(key, this, message, this.LOCALE);
 	}
-	return mf(key, this, message, this.LOCALE);
-};
+});
 
 mfPkg.sendPolicy = 'current';
 mfPkg.mfStringsSub = Meteor.subscribe('mfStrings', 'notReady');

package.js

@@ -1,6 +1,6 @@
 Package.describe({
   name:    "gadicohen:messageformat",
-  version: "0.0.46",
+  version: "0.0.47",
   summary: "MessageFormat support, the Meteor way",
   git:      "https://github.com/gadicc/meteor-messageformat.git",
 });

website/.meteor/versions

@@ -25,7 +25,7 @@ facebook@1.1.2
 fastclick@1.0.1
 follower-livedata@1.0.2
 gadicohen:headers@0.0.25
-gadicohen:messageformat@0.0.45
+gadicohen:messageformat@0.0.47
 gadicohen:syntaxhighlighter@3.0.83_19
 geojson-utils@1.0.1
 github@1.1.1

website/messageformat.js

@@ -20,12 +20,15 @@ if (Meteor.isClient) {
 	var scrolls = {};
 
     Router.onBeforeAction(function() {
+        var path = this.route.path();
+
   		// remember our scroll position for this page
-    	scrolls[this.path] = $(document).scrollTop();
+    	scrolls[path] = $(document).scrollTop();
 
         var navbar = $('div.navbar:first-child');
         navbar.find('.active').removeClass('active');
-        navbar.find('a[href="' + this.path + '"]').parent().addClass('active');
+        navbar.find('a[href="' + path + '"]').parent().addClass('active');
+
         this.next();
     });