Sfoglia il codice sorgente

replace Session key popupCard with popupCardId (better meaning of what the variable contains)

Martin Filser 3 anni fa
parent
commit
f4a3363f6f

+ 1 - 1
client/components/cards/cardDetails.js

@@ -546,7 +546,7 @@ Template.cardDetails.helpers({
   }
 });
 Template.cardDetailsPopup.onDestroyed(() => {
-  Session.delete('popupCard');
+  Session.delete('popupCardId');
   Session.delete('popupCardBoardId');
 });
 Template.cardDetailsPopup.helpers({

+ 1 - 1
client/components/cards/resultCard.js

@@ -12,7 +12,7 @@ BlazeComponent.extendComponent({
     const boardId = this.currentData().boardId;
     Meteor.subscribe('popupCardData', cardId, {
       onReady() {
-        Session.set('popupCard', cardId);
+        Session.set('popupCardId', cardId);
         Session.set('popupCardBoardId', boardId);
         this_.cardDetailsPopup(evt);
       },

+ 1 - 1
client/components/lists/listBody.js

@@ -150,7 +150,7 @@ BlazeComponent.extendComponent({
       // overwriting the event in case the card is already selected.
     } else if (Utils.isMiniScreen()) {
       evt.preventDefault();
-      Session.set('popupCard', this.currentData()._id);
+      Session.set('popupCardId', this.currentData()._id);
       this.cardDetailsPopup(evt);
     } else if (Session.equals('currentCard', this.currentData()._id)) {
       evt.stopImmediatePropagation();

+ 1 - 1
client/components/sidebar/sidebarSearches.js

@@ -16,7 +16,7 @@ BlazeComponent.extendComponent({
   clickOnMiniCard(evt) {
     if (Utils.isMiniScreen()) {
       evt.preventDefault();
-      Session.set('popupCard', this.currentData()._id);
+      Session.set('popupCardId', this.currentData()._id);
       this.cardDetailsPopup(evt);
     }
   },

+ 1 - 1
client/lib/utils.js

@@ -19,7 +19,7 @@ Utils = {
     return ret;
   },
   getPopupCardId() {
-    const ret = Session.get('popupCard');
+    const ret = Session.get('popupCardId');
     return ret;
   },
   /** returns the current board

+ 9 - 9
config/router.js

@@ -12,7 +12,7 @@ FlowRouter.route('/', {
     Session.set('currentBoard', null);
     Session.set('currentList', null);
     Session.set('currentCard', null);
-    Session.set('popupCard', null);
+    Session.set('popupCardId', null);
     Session.set('popupCardBoardId', null);
 
     Filter.reset();
@@ -36,7 +36,7 @@ FlowRouter.route('/public', {
     Session.set('currentBoard', null);
     Session.set('currentList', null);
     Session.set('currentCard', null);
-    Session.set('popupCard', null);
+    Session.set('popupCardId', null);
     Session.set('popupCardBoardId', null);
 
     Filter.reset();
@@ -60,7 +60,7 @@ FlowRouter.route('/b/:id/:slug', {
     const previousBoard = Session.get('currentBoard');
     Session.set('currentBoard', currentBoard);
     Session.set('currentCard', null);
-    Session.set('popupCard', null);
+    Session.set('popupCardId', null);
     Session.set('popupCardBoardId', null);
 
     // If we close a card, we'll execute again this route action but we don't
@@ -90,7 +90,7 @@ FlowRouter.route('/b/:boardId/:slug/:cardId', {
 
     Session.set('currentBoard', params.boardId);
     Session.set('currentCard', params.cardId);
-    Session.set('popupCard', null);
+    Session.set('popupCardId', null);
     Session.set('popupCardBoardId', null);
 
     Utils.manageCustomUI();
@@ -220,7 +220,7 @@ FlowRouter.route('/import/:source', {
     Session.set('currentBoard', null);
     Session.set('currentList', null);
     Session.set('currentCard', null);
-    Session.set('popupCard', null);
+    Session.set('popupCardId', null);
     Session.set('popupCardBoardId', null);
     Session.set('importSource', params.source);
 
@@ -242,7 +242,7 @@ FlowRouter.route('/setting', {
       Session.set('currentBoard', null);
       Session.set('currentList', null);
       Session.set('currentCard', null);
-      Session.set('popupCard', null);
+      Session.set('popupCardId', null);
       Session.set('popupCardBoardId', null);
 
       Filter.reset();
@@ -267,7 +267,7 @@ FlowRouter.route('/information', {
       Session.set('currentBoard', null);
       Session.set('currentList', null);
       Session.set('currentCard', null);
-      Session.set('popupCard', null);
+      Session.set('popupCardId', null);
       Session.set('popupCardBoardId', null);
 
       Filter.reset();
@@ -291,7 +291,7 @@ FlowRouter.route('/people', {
       Session.set('currentBoard', null);
       Session.set('currentList', null);
       Session.set('currentCard', null);
-      Session.set('popupCard', null);
+      Session.set('popupCardId', null);
       Session.set('popupCardBoardId', null);
 
       Filter.reset();
@@ -315,7 +315,7 @@ FlowRouter.route('/admin-reports', {
       Session.set('currentBoard', null);
       Session.set('currentList', null);
       Session.set('currentCard', null);
-      Session.set('popupCard', null);
+      Session.set('popupCardId', null);
       Session.set('popupCardBoardId', null);
 
       Filter.reset();