apitech
/
wekan
mirror of https://github.com/wekan/wekan
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Upgrade meteor to 1.2-rc.4 and package versions

Browse Source 
The new version of meteor speeds up the reload cycle, which is super
valuable during the development. I also removed the "imply-everything"
"meteor-platform" package in favor of a more fined-grained package
selection.

This version also introduces ES6 support with transparent babeljs
transpilation. Most features are enable (with the notable exception of
ES6 modules) and this commit started to use them in places where a XXX
comment suggested it.
pull/195/merge
Maxime Quandalle 10 years ago
parent 9bea6a52d3
commit 07cc454b41
6 changed files with 118 additions and 98 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 37
      .meteor/packages
  2. 2
      .meteor/release
  3. 145
      .meteor/versions
  4. 7
      client/components/cards/details.js
  5. 8
      client/components/forms/inlinedform.js
  6. 15
      client/lib/escapeActions.js

37
.meteor/packages
Unescape View File

@ -6,21 +6,17 @@
# XXX Should we replace tmeasday:presence by 3stack:presence? Or maybe the # XXX Should we replace tmeasday:presence by 3stack:presence? Or maybe the
# packages will merge in the future? # packages will merge in the future?
meteor-platform meteor-base
# Account system # Build system
accounts-password es5-shim
kenton:accounts-sandstorm ecmascript
service-configuration standard-minifiers
useraccounts:core
useraccounts:unstyled
useraccounts:flow-routing
# Compilers
mquandalle:jade mquandalle:jade
mquandalle:stylus mquandalle:stylus
# Collections # Collections
mongo
aldeed:collection2 aldeed:collection2
cfs:gridfs cfs:gridfs
cfs:standard-packages cfs:standard-packages
@ -30,7 +26,22 @@ matb33:collection-hooks
matteodem:easy-search matteodem:easy-search
reywood:publish-composite reywood:publish-composite
# Account system
accounts-password
kenton:accounts-sandstorm
service-configuration
useraccounts:core
useraccounts:unstyled
useraccounts:flow-routing
# Utilities # Utilities
check
jquery
random
reactive-dict
session
tracker
underscore
alethes:pages alethes:pages
arillo:flow-router-helpers arillo:flow-router-helpers
audit-argument-checks audit-argument-checks
@ -43,19 +54,17 @@ mquandalle:bower
mquandalle:moment mquandalle:moment
ongoworks:speakingurl ongoworks:speakingurl
raix:handlebar-helpers raix:handlebar-helpers
random
reactive-dict
tap:i18n tap:i18n
tmeasday:presence tmeasday:presence
underscore
# UI components # UI components
blaze
reactive-var
fortawesome:fontawesome fortawesome:fontawesome
mousetrap:mousetrap mousetrap:mousetrap
mquandalle:jquery-textcomplete mquandalle:jquery-textcomplete
mquandalle:jquery-ui-drag-drop-sort mquandalle:jquery-ui-drag-drop-sort
peerlibrary:blaze-components peerlibrary:blaze-components
perak:markdown perak:markdown
reactive-var
seriousm:emoji-continued seriousm:emoji-continued
templates:tabs templates:tabs

2
.meteor/release
Unescape View File

@ -1 +1 @@
METEOR@1.1.0.2 METEOR@1.2-rc.4

145
.meteor/versions
Unescape View File

@ -1,17 +1,21 @@
accounts-base@1.2.0 accounts-base@1.2.1-rc.0
accounts-password@1.1.1 accounts-password@1.1.2-rc.0
aldeed:collection2@2.3.3 aldeed:collection2@2.3.3
aldeed:simple-schema@1.3.3 aldeed:simple-schema@1.3.3
alethes:pages@1.8.4 alethes:pages@1.8.4
arillo:flow-router-helpers@0.4.3 arillo:flow-router-helpers@0.4.4_1
audit-argument-checks@1.0.3 audit-argument-checks@1.0.4-rc.0
autoupdate@1.2.1 autoupdate@1.2.3-rc.0
base64@1.0.3 babel-compiler@5.8.20-rc.0
binary-heap@1.0.3 babel-runtime@0.1.4-rc.0
blaze@2.1.2 base64@1.0.4-rc.0
blaze-tools@1.0.3 binary-heap@1.0.4-rc.0
boilerplate-generator@1.0.3 blaze@2.1.3-rc.0
callback-hook@1.0.3 blaze-tools@1.0.4-rc.0
boilerplate-generator@1.0.4-rc.0
caching-compiler@1.0.0-rc.0
caching-html-compiler@1.0.1-rc.0
callback-hook@1.0.4-rc.0
cfs:access-point@0.1.49 cfs:access-point@0.1.49
cfs:base-package@0.0.30 cfs:base-package@0.0.30
cfs:collection@0.5.5 cfs:collection@0.5.5
@ -29,91 +33,106 @@ cfs:storage-adapter@0.2.2
cfs:tempstore@0.1.5 cfs:tempstore@0.1.5
cfs:upload-http@0.0.20 cfs:upload-http@0.0.20
cfs:worker@0.1.4 cfs:worker@0.1.4
check@1.0.5 check@1.0.6-rc.0
coffeescript@1.0.6 coffeescript@1.0.8-rc.1
cosmos:browserify@0.5.0 cosmos:browserify@0.5.0
dburles:collection-helpers@1.0.3 dburles:collection-helpers@1.0.3
ddp@1.1.0 ddp@1.2.1-rc.0
deps@1.0.7 ddp-client@1.2.1-rc.0
ejson@1.0.6 ddp-common@1.2.1-rc.0
email@1.0.6 ddp-rate-limiter@1.0.0-rc.0
fastclick@1.0.3 ddp-server@1.2.1-rc.0
deps@1.0.8-rc.0
diff-sequence@1.0.1-rc.0
ecmascript@0.1.3-rc.0
ecmascript-collections@0.1.5-rc.0
ejson@1.0.7-rc.0
email@1.0.7-rc.0
es5-shim@0.1.0-rc.0
fastclick@1.0.7-rc.0
fortawesome:fontawesome@4.4.0 fortawesome:fontawesome@4.4.0
geojson-utils@1.0.3 geojson-utils@1.0.4-rc.0
html-tools@1.0.4 hot-code-push@1.0.0-rc.0
htmljs@1.0.4 html-tools@1.0.5-rc.0
http@1.1.0 htmljs@1.0.5-rc.1
id-map@1.0.3 http@1.1.1-rc.0
id-map@1.0.4-rc.0
idmontie:migrations@1.0.0 idmontie:migrations@1.0.0
jquery@1.11.3_2 jquery@1.11.4-rc.0
json@1.0.3
kadira:blaze-layout@2.0.0 kadira:blaze-layout@2.0.0
kadira:flow-router@2.3.0 kadira:flow-router@2.3.0
kenton:accounts-sandstorm@0.1.4 kenton:accounts-sandstorm@0.1.4
launch-screen@1.0.2 launch-screen@1.0.3-rc.0
less@1.0.14 less@2.5.0-rc.1_1
livedata@1.0.13 livedata@1.0.14-rc.0
localstorage@1.0.3 localstorage@1.0.4-rc.0
logging@1.0.7 logging@1.0.8-rc.0
matb33:collection-hooks@0.7.14 matb33:collection-hooks@0.7.14
matteodem:easy-search@1.6.2 matteodem:easy-search@1.6.3
meteor@1.1.6 meteor@1.1.7-rc.0
meteor-platform@1.2.2 meteor-base@1.0.1-rc.0
meteor-platform@1.2.3-rc.0
meteorhacks:aggregate@1.2.1 meteorhacks:aggregate@1.2.1
meteorhacks:collection-utils@1.2.0 meteorhacks:collection-utils@1.2.0
meteorhacks:picker@1.0.3 meteorhacks:picker@1.0.3
meteorhacks:subs-manager@1.5.2 meteorhacks:subs-manager@1.5.2
meteorspark:util@0.2.0 meteorspark:util@0.2.0
minifiers@1.1.5 minifiers@1.1.6-rc.1
minimongo@1.0.8 minimongo@1.0.9-rc.0
mobile-status-bar@1.0.3 mobile-status-bar@1.0.5-rc.0
mongo@1.1.0 mongo@1.1.1-rc.1
mongo-livedata@1.0.8 mongo-id@1.0.1-rc.0
mongo-livedata@1.0.9-rc.0
mousetrap:mousetrap@1.4.6_1 mousetrap:mousetrap@1.4.6_1
mquandalle:autofocus@1.0.0 mquandalle:autofocus@1.0.0
mquandalle:bower@1.4.1_3 mquandalle:bower@1.4.1_3
mquandalle:jade@0.4.3 mquandalle:jade@0.4.3_1
mquandalle:jade-compiler@0.4.3 mquandalle:jade-compiler@0.4.3
mquandalle:jquery-textcomplete@0.3.9_1 mquandalle:jquery-textcomplete@0.3.9_1
mquandalle:jquery-ui-drag-drop-sort@0.1.0 mquandalle:jquery-ui-drag-drop-sort@0.1.0
mquandalle:moment@1.0.0 mquandalle:moment@1.0.0
mquandalle:stylus@1.1.1 mquandalle:stylus@1.1.1
npm-bcrypt@0.7.8_2 npm-bcrypt@0.7.8_2
observe-sequence@1.0.6 npm-mongo@1.4.39-rc.0_1
observe-sequence@1.0.7-rc.0
ongoworks:speakingurl@1.1.0 ongoworks:speakingurl@1.1.0
ordered-dict@1.0.3 ordered-dict@1.0.4-rc.0
peerlibrary:assert@0.2.5 peerlibrary:assert@0.2.5
peerlibrary:base-component@0.10.0 peerlibrary:base-component@0.10.0
peerlibrary:blaze-components@0.13.0 peerlibrary:blaze-components@0.13.0
perak:markdown@1.0.5 perak:markdown@1.0.5
promise@0.4.3-rc.0_1
raix:eventemitter@0.1.3 raix:eventemitter@0.1.3
raix:handlebar-helpers@0.2.4 raix:handlebar-helpers@0.2.4
random@1.0.3 random@1.0.4-rc.0
reactive-dict@1.1.0 rate-limit@1.0.0-rc.0
reactive-var@1.0.5 reactive-dict@1.1.1-rc.0
reload@1.1.3 reactive-var@1.0.6-rc.0
retry@1.0.3 reload@1.1.4-rc.0
retry@1.0.4-rc.0
reywood:publish-composite@1.4.2 reywood:publish-composite@1.4.2
routepolicy@1.0.5 routepolicy@1.0.6-rc.0
seriousm:emoji-continued@1.4.0 seriousm:emoji-continued@1.4.0
service-configuration@1.0.4 service-configuration@1.0.5-rc.0
session@1.1.0 session@1.1.1-rc.0
sha@1.0.3 sha@1.0.4-rc.0
softwarerero:accounts-t9n@1.0.9 softwarerero:accounts-t9n@1.0.9
spacebars@1.0.6 spacebars@1.0.7-rc.0
spacebars-compiler@1.0.6 spacebars-compiler@1.0.7-rc.0
srp@1.0.3 srp@1.0.4-rc.0
standard-minifiers@1.0.0-rc.1
tap:i18n@1.5.1 tap:i18n@1.5.1
templates:tabs@2.2.0 templates:tabs@2.2.0
templating@1.1.1 templating@1.1.2-rc.2
templating-tools@1.0.0-rc.0
tmeasday:presence@1.0.6 tmeasday:presence@1.0.6
tracker@1.0.7 tracker@1.0.8-rc.0
ui@1.0.6 ui@1.0.7-rc.0
underscore@1.0.3 underscore@1.0.4-rc.0
url@1.0.4 url@1.0.5-rc.0
useraccounts:core@1.12.2 useraccounts:core@1.12.3
useraccounts:flow-routing@1.12.2 useraccounts:flow-routing@1.12.3
useraccounts:unstyled@1.12.2 useraccounts:unstyled@1.12.3
webapp@1.2.0 webapp@1.2.2-rc.0
webapp-hashing@1.0.3 webapp-hashing@1.0.4-rc.0
zimme:active-route@2.3.1 zimme:active-route@2.3.1

7
client/components/cards/details.js
Unescape View File

@ -40,11 +40,10 @@ BlazeComponent.extendComponent({
}, },
events: function() { events: function() {
// XXX We can't define this event directly in the event map below because we var events = {
// miss ES6 object keys interpolation. [CSSEvents.animationend + ' .js-card-details']: function() {
var events = {};
events[CSSEvents.animationend + ' .js-card-details'] = function() {
this.isLoaded.set(true); this.isLoaded.set(true);
}
}; };
return [_.extend(events, { return [_.extend(events, {

8
client/components/forms/inlinedform.js
Unescape View File

@ -70,12 +70,10 @@ BlazeComponent.extendComponent({
// Close the inlined form when after its submission // Close the inlined form when after its submission
submit: function() { submit: function() {
var self = this;
// XXX Swith to an arrow function here when we'll have ES6
if (this.currentData().autoclose !== false) { if (this.currentData().autoclose !== false) {
Tracker.afterFlush(function() { Tracker.afterFlush(() => {
self.close(); this.close();
self.callFirstWith(self, 'resetCache'); this.callFirstWith(this, 'resetCache');
}); });
} }
} }

15
client/lib/escapeActions.js
Unescape View File

@ -17,25 +17,20 @@ EscapeActions = {
'sidebarView' 'sidebarView'
], ],
register: function(label, action, condition, options) { register: function(label, action, condition = () => true, options = {}) {
condition = condition || function() { return true; };
options = options || {};
// XXX Rewrite this with ES6: .push({ priority, condition, action })
var priority = this.hierarchy.indexOf(label); var priority = this.hierarchy.indexOf(label);
if (priority === -1) { if (priority === -1) {
throw Error('You must define the label in the EscapeActions hierarchy'); throw Error('You must define the label in the EscapeActions hierarchy');
} }
this._actions.push({ this._actions.push({
priority: priority, priority,
condition: condition, condition,
action: action, action,
noClickEscapeOn: options.noClickEscapeOn, noClickEscapeOn: options.noClickEscapeOn,
enabledOnClick: !! options.enabledOnClick enabledOnClick: !! options.enabledOnClick
}); });
// XXX Rewrite this with ES6: => function this._actions = _.sortBy(this._actions, (a) => { return a.priority; });
this._actions = _.sortBy(this._actions, function(a) { return a.priority; });
}, },
executeLowest: function() { executeLowest: function() {

Write Preview
Loading…
Cancel
Save