Skip to content

Commit ad573d2

Browse files
committed
v0.0.46: iron:router@1.0.0
1 parent 2460d1c commit ad573d2

File tree

4 files changed

+85
-65
lines changed

4 files changed

+85
-65
lines changed

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
MessageFormat support, the Meteor way.
44

5+
For iron:router < 1.0.0, use messageformat v0.0.45.
6+
57
For Meteor < 0.8.0, use messageformat v0.0.26.
68

79
Easy reactive use of complicated strings (gender, plural, etc) with insanely

lib/mfPkg/messageformat-client.js

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -293,30 +293,32 @@ Router.map(function() {
293293
return Meteor.subscribe('mfStrings',
294294
[mfPkg.native, this.params.lang], 0, true);
295295
},
296-
onBeforeAction: function(pause) {
296+
onBeforeAction: function() {
297297
if (!mfPkg.webUI.allowed.call(this) || mfPkg.webUI.denied.call(this)) {
298298
this.render('mfTransLangDenied');
299299
pause();
300-
}
301-
302-
// Temporary, only used to override preserve on dest
303-
Session.set('mfTransTrans', this.params.lang);
304-
305-
// Handle ctrl-up/ctrl-down, respectively
306-
$(window).on('keydown.mfTrans', function(event) {
307-
if (event.ctrlKey && (event.which == 38 || event.which == 40)) {
308-
event.preventDefault(); event.stopPropagation();
309-
var tr = event.which == 38
310-
? $('#mfTransLang tr.current').prev()
311-
: $('#mfTransLang tr.current').next();
312-
if (tr.length) {
313-
changeKey(tr.data('key'));
314-
mfCheckScroll(tr);
300+
} else {
301+
302+
// Temporary, only used to override preserve on dest
303+
Session.set('mfTransTrans', this.params.lang);
304+
305+
// Handle ctrl-up/ctrl-down, respectively
306+
$(window).on('keydown.mfTrans', function(event) {
307+
if (event.ctrlKey && (event.which == 38 || event.which == 40)) {
308+
event.preventDefault(); event.stopPropagation();
309+
var tr = event.which == 38
310+
? $('#mfTransLang tr.current').prev()
311+
: $('#mfTransLang tr.current').next();
312+
if (tr.length) {
313+
changeKey(tr.data('key'));
314+
mfCheckScroll(tr);
315+
}
315316
}
316-
}
317-
});
318317

319-
this.subscribe('mfRevisions', this.params.lang, 10);
318+
});
319+
this.subscribe('mfRevisions', this.params.lang, 10);
320+
this.next();
321+
}
320322
},
321323
onStop: function() {
322324
$(window).off('keydown.mfTrans');

package.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Package.describe({
22
name: "gadicohen:messageformat",
3-
version: "0.0.45",
3+
version: "0.0.46",
44
summary: "MessageFormat support, the Meteor way",
55
git: "https://github.com/gadicc/meteor-messageformat.git",
66
});
@@ -17,7 +17,7 @@ Package.on_use(function (api) {
1717
'mongo@1.0.4',
1818
'gadicohen:headers@0.0.25',
1919
'meteorhacks:inject-initial@1.0.2',
20-
'iron:router@0.9.1'
20+
'iron:router@1.0.0'
2121
], [
2222
'client',
2323
'server'

versions.json

Lines changed: 60 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -2,190 +2,206 @@
22
"dependencies": [
33
[
44
"application-configuration",
5-
"1.0.2"
5+
"1.0.3"
66
],
77
[
88
"base64",
9-
"1.0.0"
9+
"1.0.1"
1010
],
1111
[
1212
"binary-heap",
13-
"1.0.0"
13+
"1.0.1"
1414
],
1515
[
1616
"blaze",
17-
"2.0.0"
17+
"2.0.3"
1818
],
1919
[
2020
"blaze-tools",
21-
"1.0.0"
21+
"1.0.1"
2222
],
2323
[
2424
"boilerplate-generator",
25-
"1.0.0"
25+
"1.0.1"
2626
],
2727
[
2828
"callback-hook",
29-
"1.0.0"
29+
"1.0.1"
3030
],
3131
[
3232
"check",
33-
"1.0.0"
33+
"1.0.2"
3434
],
3535
[
3636
"ddp",
37-
"1.0.8"
37+
"1.0.11"
3838
],
3939
[
4040
"deps",
41-
"1.0.3"
41+
"1.0.5"
4242
],
4343
[
4444
"ejson",
45-
"1.0.2"
45+
"1.0.4"
4646
],
4747
[
4848
"follower-livedata",
49-
"1.0.1"
49+
"1.0.2"
5050
],
5151
[
5252
"gadicohen:headers",
5353
"0.0.25"
5454
],
5555
[
5656
"geojson-utils",
57-
"1.0.0"
57+
"1.0.1"
5858
],
5959
[
6060
"html-tools",
61-
"1.0.0"
61+
"1.0.2"
6262
],
6363
[
6464
"htmljs",
65-
"1.0.1"
65+
"1.0.2"
6666
],
6767
[
6868
"id-map",
69+
"1.0.1"
70+
],
71+
[
72+
"iron:controller",
6973
"1.0.0"
7074
],
7175
[
7276
"iron:core",
73-
"0.3.4"
77+
"1.0.0"
7478
],
7579
[
7680
"iron:dynamic-template",
77-
"0.4.1"
81+
"1.0.0"
7882
],
7983
[
8084
"iron:layout",
81-
"0.4.1"
85+
"1.0.0"
86+
],
87+
[
88+
"iron:location",
89+
"1.0.0"
90+
],
91+
[
92+
"iron:middleware-stack",
93+
"1.0.0"
8294
],
8395
[
8496
"iron:router",
85-
"0.9.3"
97+
"1.0.0"
8698
],
8799
[
88-
"jquery",
100+
"iron:url",
89101
"1.0.0"
90102
],
103+
[
104+
"jquery",
105+
"1.0.1"
106+
],
91107
[
92108
"json",
93-
"1.0.0"
109+
"1.0.1"
94110
],
95111
[
96112
"livedata",
97-
"1.0.9"
113+
"1.0.11"
98114
],
99115
[
100116
"logging",
101-
"1.0.3"
117+
"1.0.5"
102118
],
103119
[
104120
"meteor",
105-
"1.1.0"
121+
"1.1.3"
106122
],
107123
[
108124
"meteorhacks:inject-initial",
109125
"1.0.2"
110126
],
111127
[
112128
"minifiers",
113-
"1.1.0"
129+
"1.1.2"
114130
],
115131
[
116132
"minimongo",
117-
"1.0.3"
133+
"1.0.5"
118134
],
119135
[
120136
"mongo",
121-
"1.0.5"
137+
"1.0.8"
122138
],
123139
[
124140
"observe-sequence",
125-
"1.0.2"
141+
"1.0.3"
126142
],
127143
[
128144
"ordered-dict",
129-
"1.0.0"
145+
"1.0.1"
130146
],
131147
[
132148
"random",
133-
"1.0.0"
149+
"1.0.1"
134150
],
135151
[
136152
"reactive-dict",
137-
"1.0.2"
153+
"1.0.4"
138154
],
139155
[
140156
"reactive-var",
141-
"1.0.1"
157+
"1.0.3"
142158
],
143159
[
144160
"retry",
145-
"1.0.0"
161+
"1.0.1"
146162
],
147163
[
148164
"routepolicy",
149-
"1.0.1"
165+
"1.0.2"
150166
],
151167
[
152168
"session",
153-
"1.0.1"
169+
"1.0.4"
154170
],
155171
[
156172
"spacebars",
157-
"1.0.1"
173+
"1.0.3"
158174
],
159175
[
160176
"spacebars-compiler",
161-
"1.0.2"
177+
"1.0.3"
162178
],
163179
[
164180
"templating",
165-
"1.0.6"
181+
"1.0.9"
166182
],
167183
[
168184
"tracker",
169-
"1.0.2"
185+
"1.0.3"
170186
],
171187
[
172188
"ui",
173-
"1.0.2"
189+
"1.0.4"
174190
],
175191
[
176192
"underscore",
177-
"1.0.0"
193+
"1.0.1"
178194
],
179195
[
180196
"webapp",
181-
"1.1.1"
197+
"1.1.4"
182198
],
183199
[
184200
"webapp-hashing",
185-
"1.0.0"
201+
"1.0.1"
186202
]
187203
],
188204
"pluginDependencies": [],
189-
"toolVersion": "meteor-tool@1.0.32",
205+
"toolVersion": "meteor-tool@1.0.35",
190206
"format": "1.0"
191207
}

0 commit comments

Comments
 (0)