github-mirror/framework
github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2025-02-28 04:14:25 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Commit latest dist files

Browse Source 
See https://github.com/flarum/core/issues/727#issuecomment-172384020
This commit is contained in:
Toby Zerner 2016-01-19 16:53:31 +10:30
parent d1ce9b1fd0
commit 84f869abf2
2 changed files with 52 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
extensions/tags/js/admin/dist/extension.js vendored
View File

@ -412,6 +412,39 @@ $.fn.sortable = function(options) {
return sortable;
}));
;
System.register('flarum/tags/addTagChangePermission', ['flarum/extend', 'flarum/components/PermissionGrid', 'flarum/components/SettingDropdown'], function (_export) {
'use strict';
var extend, PermissionGrid, SettingDropdown;
return {
setters: [function (_flarumExtend) {
extend = _flarumExtend.extend;
}, function (_flarumComponentsPermissionGrid) {
PermissionGrid = _flarumComponentsPermissionGrid['default'];
}, function (_flarumComponentsSettingDropdown) {
SettingDropdown = _flarumComponentsSettingDropdown['default'];
}],
execute: function () {
_export('default', function () {
extend(PermissionGrid.prototype, 'startItems', function (items) {
items.add('allowTagChange', {
icon: 'tags',
label: app.translator.trans('flarum-tags.admin.permissions.allow_edit_tags_label'),
setting: function setting() {
var minutes = parseInt(app.settings.allow_tag_change, 10);
return SettingDropdown.component({
defaultLabel: minutes ? app.translator.transChoice('core.admin.permissions_controls.allow_some_minutes_button', minutes, { count: minutes }) : app.translator.trans('core.admin.permissions_controls.allow_indefinitely_button'),
key: 'allow_tag_change',
options: [{ value: '-1', label: app.translator.trans('core.admin.permissions_controls.allow_indefinitely_button') }, { value: '10', label: app.translator.trans('core.admin.permissions_controls.allow_ten_minutes_button') }, { value: 'reply', label: app.translator.trans('core.admin.permissions_controls.allow_until_reply_button') }]
});
}
}, 90);
});
});
}
};
});;
System.register('flarum/tags/addTagPermission', ['flarum/extend', 'flarum/components/PermissionGrid'], function (_export) {
'use strict';
@ -782,11 +815,11 @@ System.register('flarum/tags/components/TagSettingsModal', ['flarum/components/S
}, {
key: 'form',
value: function form() {
var minPrimaryTags = this.setting('tags.min_primary_tags', 0);
var maxPrimaryTags = this.setting('tags.max_primary_tags', 0);
var minPrimaryTags = this.setting('flarum-tags.min_primary_tags', 0);
var maxPrimaryTags = this.setting('flarum-tags.max_primary_tags', 0);
var minSecondaryTags = this.setting('tags.min_secondary_tags', 0);
var maxSecondaryTags = this.setting('tags.max_secondary_tags', 0);
var minSecondaryTags = this.setting('flarum-tags.min_secondary_tags', 0);
var maxSecondaryTags = this.setting('flarum-tags.max_secondary_tags', 0);
return [m(
'div',
@ -1177,10 +1210,10 @@ System.register('flarum/tags/helpers/tagsLabel', ['flarum/utils/extract', 'flaru
execute: function () {}
};
});;
System.register('flarum/tags/main', ['flarum/tags/models/Tag', 'flarum/tags/addTagsPermissionScope', 'flarum/tags/addTagPermission', 'flarum/tags/addTagsPane', 'flarum/tags/addTagsHomePageOption'], function (_export) {
System.register('flarum/tags/main', ['flarum/tags/models/Tag', 'flarum/tags/addTagsPermissionScope', 'flarum/tags/addTagPermission', 'flarum/tags/addTagsPane', 'flarum/tags/addTagsHomePageOption', 'flarum/tags/addTagChangePermission'], function (_export) {
'use strict';
var Tag, addTagsPermissionScope, addTagPermission, addTagsPane, addTagsHomePageOption;
var Tag, addTagsPermissionScope, addTagPermission, addTagsPane, addTagsHomePageOption, addTagChangePermission;
return {
setters: [function (_flarumTagsModelsTag) {
Tag = _flarumTagsModelsTag['default'];
@ -1192,6 +1225,8 @@ System.register('flarum/tags/main', ['flarum/tags/models/Tag', 'flarum/tags/addT
addTagsPane = _flarumTagsAddTagsPane['default'];
}, function (_flarumTagsAddTagsHomePageOption) {
addTagsHomePageOption = _flarumTagsAddTagsHomePageOption['default'];
}, function (_flarumTagsAddTagChangePermission) {
addTagChangePermission = _flarumTagsAddTagChangePermission['default'];
}],
execute: function () {
@ -1202,6 +1237,7 @@ System.register('flarum/tags/main', ['flarum/tags/models/Tag', 'flarum/tags/addT
addTagPermission();
addTagsPane();
addTagsHomePageOption();
addTagChangePermission();
});
}
};

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

@ -21,9 +21,13 @@ System.register('flarum/tags/addTagComposer', ['flarum/extend', 'flarum/componen
var tag = app.store.getBy('tags', 'slug', this.params().tags);
if (tag) {
promise.then(function (component) {
return component.tags = [tag];
});
(function () {
var parent = tag.parent();
var tags = parent ? [parent, tag] : [tag];
promise.then(function (component) {
return component.tags = tags;
});
})();
}
});
@ -831,7 +835,7 @@ System.register('flarum/tags/components/TagHero', ['flarum/Component'], function
return m(
'header',
{ className: 'Hero TagHero',
{ className: 'Hero TagHero' + (color ? ' TagHero--colored' : ''),
style: color ? { color: '#fff', backgroundColor: color } : '' },
m(
'div',
@ -988,9 +992,9 @@ System.register('flarum/tags/components/TagsPage', ['flarum/Component', 'flarum/
{ className: 'TagTiles' },
pinned.map(function (tag) {
var lastDiscussion = tag.lastDiscussion();
var children = app.store.all('tags').filter(function (child) {
var children = sortTags(app.store.all('tags').filter(function (child) {
return child.parent() === tag;
});
}));
return m(
'li',