mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-08-16 05:14:20 +02:00
Code Issues Releases Wiki Activity

Use the variables that are already instantiated

Browse Source
This commit is contained in:
Franz Liedke
2016-05-15 20:58:29 +09:00
parent 6e0f77b0e3
commit 7190cd84b4
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
extensions/tags/js/forum/dist/extension.js vendored
View File

@@ -553,13 +553,13 @@ System.register('flarum/tags/components/TagDiscussionModal', ['flarum/components
// If the number of selected primary/secondary tags is at the maximum, then // If the number of selected primary/secondary tags is at the maximum, then
// we'll filter out all other tags of that type. // we'll filter out all other tags of that type.
if (primaryCount >= app.forum.attribute('maxPrimaryTags')) { if (primaryCount >= this.maxPrimary) {
tags = tags.filter(function (tag) { tags = tags.filter(function (tag) {
return !tag.isPrimary() || _this2.selected.indexOf(tag) !== -1; return !tag.isPrimary() || _this2.selected.indexOf(tag) !== -1;
}); });
} }
if (secondaryCount >= app.forum.attribute('maxSecondaryTags')) { if (secondaryCount >= this.maxSecondary) {
tags = tags.filter(function (tag) { tags = tags.filter(function (tag) {
return tag.isPrimary() || _this2.selected.indexOf(tag) !== -1; return tag.isPrimary() || _this2.selected.indexOf(tag) !== -1;
}); });

4
extensions/tags/js/forum/src/components/TagDiscussionModal.js
View File

@@ -116,11 +116,11 @@ export default class TagDiscussionModal extends Modal {
// If the number of selected primary/secondary tags is at the maximum, then // If the number of selected primary/secondary tags is at the maximum, then
// we'll filter out all other tags of that type. // we'll filter out all other tags of that type.
if (primaryCount >= app.forum.attribute('maxPrimaryTags')) { if (primaryCount >= this.maxPrimary) {
tags = tags.filter(tag => !tag.isPrimary() || this.selected.indexOf(tag) !== -1); tags = tags.filter(tag => !tag.isPrimary() || this.selected.indexOf(tag) !== -1);
} }
if (secondaryCount >= app.forum.attribute('maxSecondaryTags')) { if (secondaryCount >= this.maxSecondary) {
tags = tags.filter(tag => tag.isPrimary() || this.selected.indexOf(tag) !== -1); tags = tags.filter(tag => tag.isPrimary() || this.selected.indexOf(tag) !== -1);
} }