diff options
| -rw-r--r-- | .meteor/versions | 23 | ||||
| -rw-r--r-- | client/components/activities/activities.js | 2 | ||||
| -rw-r--r-- | client/components/boards/boardBody.js | 4 | ||||
| -rw-r--r-- | client/components/cards/cardDetails.js | 14 | ||||
| -rw-r--r-- | client/components/lists/list.js | 4 | ||||
| -rw-r--r-- | client/components/lists/listBody.js | 2 | ||||
| -rw-r--r-- | client/components/lists/listHeader.js | 2 | ||||
| -rw-r--r-- | client/components/sidebar/sidebar.js | 2 |
8 files changed, 27 insertions, 26 deletions
diff --git a/.meteor/versions b/.meteor/versions index 023e10aa..9a2087f1 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -60,16 +60,15 @@ http@1.1.1 id-map@1.0.4 idmontie:migrations@1.0.0 jquery@1.11.4 -kadira:blaze-layout@2.1.0 +kadira:blaze-layout@2.2.0 kadira:flow-router@2.7.0 kenton:accounts-sandstorm@0.1.6 launch-screen@1.0.4 -less@2.5.0_3 livedata@1.0.15 localstorage@1.0.5 logging@1.0.8 -matb33:collection-hooks@0.8.0 -matteodem:easy-search@1.6.3 +matb33:collection-hooks@0.8.1 +matteodem:easy-search@1.6.4 meteor@1.1.9 meteor-base@1.0.1 meteor-platform@1.2.3 @@ -101,12 +100,14 @@ observe-sequence@1.0.7 ongoworks:speakingurl@1.1.0 ordered-dict@1.0.4 peerlibrary:assert@0.2.5 -peerlibrary:base-component@0.10.0 -peerlibrary:blaze-components@0.13.0 +peerlibrary:base-component@0.13.0 +peerlibrary:blaze-components@0.14.0 +peerlibrary:computed-field@0.3.0 +peerlibrary:reactive-field@0.1.0 perak:markdown@1.0.5 promise@0.5.0 raix:eventemitter@0.1.3 -raix:handlebar-helpers@0.2.4 +raix:handlebar-helpers@0.2.5 random@1.0.4 rate-limit@1.0.0 reactive-dict@1.1.2 @@ -124,7 +125,7 @@ spacebars@1.0.7 spacebars-compiler@1.0.7 srp@1.0.4 standard-minifiers@1.0.1 -tap:i18n@1.6.1 +tap:i18n@1.7.0 templates:tabs@2.2.0 templating@1.1.4 templating-tools@1.0.0 @@ -132,9 +133,9 @@ tracker@1.0.9 ui@1.0.8 underscore@1.0.4 url@1.0.5 -useraccounts:core@1.12.3 -useraccounts:flow-routing@1.12.3 -useraccounts:unstyled@1.12.3 +useraccounts:core@1.12.4 +useraccounts:flow-routing@1.12.4 +useraccounts:unstyled@1.12.4 verron:autosize@3.0.8 webapp@1.2.2 webapp-hashing@1.0.5 diff --git a/client/components/activities/activities.js b/client/components/activities/activities.js index b25c0ca8..a491c2e8 100644 --- a/client/components/activities/activities.js +++ b/client/components/activities/activities.js @@ -9,7 +9,7 @@ BlazeComponent.extendComponent({ // XXX Should we use ReactiveNumber? this.page = new ReactiveVar(1); this.loadNextPageLocked = false; - const sidebar = this.componentParent(); // XXX for some reason not working + const sidebar = this.parentComponent(); // XXX for some reason not working sidebar.callFirstWith(null, 'resetNextPeak'); this.autorun(() => { const mode = this.data().mode; diff --git a/client/components/boards/boardBody.js b/client/components/boards/boardBody.js index 95590beb..517e53ba 100644 --- a/client/components/boards/boardBody.js +++ b/client/components/boards/boardBody.js @@ -34,7 +34,7 @@ BlazeComponent.extendComponent({ }, openNewListForm() { - this.componentChildren('addListForm')[0].open(); + this.childrenComponents('addListForm')[0].open(); }, // XXX Flow components allow us to avoid creating these two setter methods by @@ -179,7 +179,7 @@ BlazeComponent.extendComponent({ // Proxy open() { - this.componentChildren('inlinedForm')[0].open(); + this.childrenComponents('inlinedForm')[0].open(); }, events() { diff --git a/client/components/cards/cardDetails.js b/client/components/cards/cardDetails.js index 58ce28e4..5e07abab 100644 --- a/client/components/cards/cardDetails.js +++ b/client/components/cards/cardDetails.js @@ -13,19 +13,19 @@ BlazeComponent.extendComponent({ }, reachNextPeak() { - const activitiesComponent = this.componentChildren('activities')[0]; + const activitiesComponent = this.childrenComponents('activities')[0]; activitiesComponent.loadNextPage(); }, onCreated() { this.isLoaded = new ReactiveVar(false); - this.componentParent().showOverlay.set(true); - this.componentParent().mouseHasEnterCardDetails = false; + this.parentComponent().showOverlay.set(true); + this.parentComponent().mouseHasEnterCardDetails = false; }, scrollParentContainer() { const cardPanelWidth = 510; - const bodyBoardComponent = this.componentParent(); + const bodyBoardComponent = this.parentComponent(); const $cardContainer = bodyBoardComponent.$('.js-lists'); const $cardView = this.$(this.firstNode()); @@ -52,7 +52,7 @@ BlazeComponent.extendComponent({ }, onDestroyed() { - this.componentParent().showOverlay.set(false); + this.parentComponent().showOverlay.set(false); }, events() { @@ -83,8 +83,8 @@ BlazeComponent.extendComponent({ 'click .js-add-members': Popup.open('cardMembers'), 'click .js-add-labels': Popup.open('cardLabels'), 'mouseenter .js-card-details'() { - this.componentParent().showOverlay.set(true); - this.componentParent().mouseHasEnterCardDetails = true; + this.parentComponent().showOverlay.set(true); + this.parentComponent().mouseHasEnterCardDetails = true; }, })]; }, diff --git a/client/components/lists/list.js b/client/components/lists/list.js index af9bef98..75e816b5 100644 --- a/client/components/lists/list.js +++ b/client/components/lists/list.js @@ -7,7 +7,7 @@ BlazeComponent.extendComponent({ // Proxy openForm(options) { - this.componentChildren('listBody')[0].openForm(options); + this.childrenComponents('listBody')[0].openForm(options); }, onCreated() { @@ -25,7 +25,7 @@ BlazeComponent.extendComponent({ if (!Meteor.user() || !Meteor.user().isBoardMember()) return; - const boardComponent = this.componentParent(); + const boardComponent = this.parentComponent(); const itemsSelector = '.js-minicard:not(.placeholder, .js-card-composer)'; const $cards = this.$('.js-minicards'); $cards.sortable({ diff --git a/client/components/lists/listBody.js b/client/components/lists/listBody.js index 0b69b50a..88b31788 100644 --- a/client/components/lists/listBody.js +++ b/client/components/lists/listBody.js @@ -11,7 +11,7 @@ BlazeComponent.extendComponent({ options = options || {}; options.position = options.position || 'top'; - const forms = this.componentChildren('inlinedForm'); + const forms = this.childrenComponents('inlinedForm'); let form = _.find(forms, (component) => { return component.data().position === options.position; }); diff --git a/client/components/lists/listHeader.js b/client/components/lists/listHeader.js index 4f5fc3a0..b5df2c81 100644 --- a/client/components/lists/listHeader.js +++ b/client/components/lists/listHeader.js @@ -5,7 +5,7 @@ BlazeComponent.extendComponent({ editTitle(evt) { evt.preventDefault(); - const newTitle = this.componentChildren('inlinedForm')[0].getValue(); + const newTitle = this.childrenComponents('inlinedForm')[0].getValue(); const list = this.currentData(); if ($.trim(newTitle)) { list.rename(newTitle); diff --git a/client/components/sidebar/sidebar.js b/client/components/sidebar/sidebar.js index ff65ad9d..72866055 100644 --- a/client/components/sidebar/sidebar.js +++ b/client/components/sidebar/sidebar.js @@ -54,7 +54,7 @@ BlazeComponent.extendComponent({ }, reachNextPeak() { - const activitiesComponent = this.componentChildren('activities')[0]; + const activitiesComponent = this.childrenComponents('activities')[0]; activitiesComponent.loadNextPage(); }, |