0&&t.add("reset",m(F.a,{icon:"far fa-eye-slash",onclick:function(){return app.modal.show(T,{discussion:e})}},app.translator.trans("michaelbelgium-discussion-views.forum.discussion_controls.resetviews_button")))}))}))}]);
//# sourceMappingURL=forum.js.map
\ No newline at end of file
diff --git a/js/dist/forum.js.map b/js/dist/forum.js.map
index f85761b..65e22a9 100644
--- a/js/dist/forum.js.map
+++ b/js/dist/forum.js.map
@@ -1 +1 @@
-{"version":3,"sources":["webpack://@michaelbelgium/flarum-discussion-views/webpack/bootstrap","webpack://@michaelbelgium/flarum-discussion-views/external \"flarum.core.compat['extend']\"","webpack://@michaelbelgium/flarum-discussion-views/external \"flarum.core.compat['Model']\"","webpack://@michaelbelgium/flarum-discussion-views/external \"flarum.core.compat['app']\"","webpack://@michaelbelgium/flarum-discussion-views/./node_modules/@babel/runtime/helpers/esm/inheritsLoose.js","webpack://@michaelbelgium/flarum-discussion-views/external \"flarum.core.compat['components/DiscussionList']\"","webpack://@michaelbelgium/flarum-discussion-views/external \"flarum.core.compat['components/Button']\"","webpack://@michaelbelgium/flarum-discussion-views/external \"flarum.core.compat['models/Discussion']\"","webpack://@michaelbelgium/flarum-discussion-views/external \"flarum.core.compat['utils/DiscussionControls']\"","webpack://@michaelbelgium/flarum-discussion-views/external \"flarum.core.compat['components/DiscussionListItem']\"","webpack://@michaelbelgium/flarum-discussion-views/external \"flarum.core.compat['components/DiscussionPage']\"","webpack://@michaelbelgium/flarum-discussion-views/external \"flarum.core.compat['components/FieldSet']\"","webpack://@michaelbelgium/flarum-discussion-views/external \"flarum.core.compat['utils/abbreviateNumber']\"","webpack://@michaelbelgium/flarum-discussion-views/external \"flarum.core.compat['helpers/avatar']\"","webpack://@michaelbelgium/flarum-discussion-views/external \"flarum.core.compat['utils/ItemList']\"","webpack://@michaelbelgium/flarum-discussion-views/external \"flarum.core.compat['utils/string']\"","webpack://@michaelbelgium/flarum-discussion-views/external \"flarum.core.compat['utils/humanTime']\"","webpack://@michaelbelgium/flarum-discussion-views/external \"flarum.core.compat['components/Modal']\"","webpack://@michaelbelgium/flarum-discussion-views/./node_modules/@babel/runtime/helpers/esm/assertThisInitialized.js","webpack://@michaelbelgium/flarum-discussion-views/./node_modules/@babel/runtime/helpers/esm/defineProperty.js","webpack://@michaelbelgium/flarum-discussion-views/./src/forum/models/DiscussionView.js","webpack://@michaelbelgium/flarum-discussion-views/./src/forum/components/ResetDiscussionViewsModal.js","webpack://@michaelbelgium/flarum-discussion-views/./src/forum/index.js","webpack://@michaelbelgium/flarum-discussion-views/./src/forum/components/AddPopularSort.js","webpack://@michaelbelgium/flarum-discussion-views/./src/forum/components/AddViewsToModelAndDisplay.js","webpack://@michaelbelgium/flarum-discussion-views/./src/forum/components/AddModerationControl.js"],"names":["installedModules","__webpack_require__","moduleId","exports","module","i","l","modules","call","m","c","d","name","getter","o","Object","defineProperty","enumerable","get","r","Symbol","toStringTag","value","t","mode","__esModule","ns","create","key","bind","n","object","property","prototype","hasOwnProperty","p","s","flarum","core","compat","_inheritsLoose","subClass","superClass","constructor","__proto__","_assertThisInitialized","self","ReferenceError","_defineProperty","obj","configurable","writable","DiscussionView","Model","attribute","transformDate","hasOne","ResetDiscussionViewsModal","init","this","discussion","props","currentViewsCount","viewCount","content","className","app","translator","transChoice","count","Button","component","type","loading","children","trans","title","onsubmit","e","preventDefault","save","resetViews","then","redraw","reason","console","log","hide","Modal","initializers","add","extend","DiscussionList","map","forum","popular","unpopular","store","models","discussionviews","Discussion","views","hasMany","canReset","DiscussionListItem","items","number","abbreviateNumber","params","include","push","DiscussionPage","viewList","ItemList","$","each","view","userName","user","ucfirst","username","listitem","avatar","visitedAt","toLocaleString","humanTime","href","route","FieldSet","label","toArray","DiscussionControls","icon","onclick","resetViewsAction","modal","show"],"mappings":"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","file":"forum.js","sourcesContent":[" \t// The module cache\n \tvar installedModules = {};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId]) {\n \t\t\treturn installedModules[moduleId].exports;\n \t\t}\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, { enumerable: true, get: getter });\n \t\t}\n \t};\n\n \t// define __esModule on exports\n \t__webpack_require__.r = function(exports) {\n \t\tif(typeof Symbol !== 'undefined' && Symbol.toStringTag) {\n \t\t\tObject.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });\n \t\t}\n \t\tObject.defineProperty(exports, '__esModule', { value: true });\n \t};\n\n \t// create a fake namespace object\n \t// mode & 1: value is a module id, require it\n \t// mode & 2: merge all properties of value into the ns\n \t// mode & 4: return value when already ns object\n \t// mode & 8|1: behave like require\n \t__webpack_require__.t = function(value, mode) {\n \t\tif(mode & 1) value = __webpack_require__(value);\n \t\tif(mode & 8) return value;\n \t\tif((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;\n \t\tvar ns = Object.create(null);\n \t\t__webpack_require__.r(ns);\n \t\tObject.defineProperty(ns, 'default', { enumerable: true, value: value });\n \t\tif(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));\n \t\treturn ns;\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"\";\n\n\n \t// Load entry module and return exports\n \treturn __webpack_require__(__webpack_require__.s = 20);\n","module.exports = flarum.core.compat['extend'];","module.exports = flarum.core.compat['Model'];","module.exports = flarum.core.compat['app'];","export default function _inheritsLoose(subClass, superClass) {\n subClass.prototype = Object.create(superClass.prototype);\n subClass.prototype.constructor = subClass;\n subClass.__proto__ = superClass;\n}","module.exports = flarum.core.compat['components/DiscussionList'];","module.exports = flarum.core.compat['components/Button'];","module.exports = flarum.core.compat['models/Discussion'];","module.exports = flarum.core.compat['utils/DiscussionControls'];","module.exports = flarum.core.compat['components/DiscussionListItem'];","module.exports = flarum.core.compat['components/DiscussionPage'];","module.exports = flarum.core.compat['components/FieldSet'];","module.exports = flarum.core.compat['utils/abbreviateNumber'];","module.exports = flarum.core.compat['helpers/avatar'];","module.exports = flarum.core.compat['utils/ItemList'];","module.exports = flarum.core.compat['utils/string'];","module.exports = flarum.core.compat['utils/humanTime'];","module.exports = flarum.core.compat['components/Modal'];","export default function _assertThisInitialized(self) {\n if (self === void 0) {\n throw new ReferenceError(\"this hasn't been initialised - super() hasn't been called\");\n }\n\n return self;\n}","export default function _defineProperty(obj, key, value) {\n if (key in obj) {\n Object.defineProperty(obj, key, {\n value: value,\n enumerable: true,\n configurable: true,\n writable: true\n });\n } else {\n obj[key] = value;\n }\n\n return obj;\n}","import Model from 'flarum/Model';\r\n\r\nexport default class DiscussionView extends Model {\r\n //comes from DiscussionViewSerializer (user(), discussion(), visited_at)\r\n visitedAt = Model.attribute('visited_at', Model.transformDate);\r\n user = Model.hasOne('user');\r\n discussion = Model.hasOne('discussion');\r\n}","import Modal from 'flarum/components/Modal';\r\nimport Button from 'flarum/components/Button';\r\n\r\nexport default class ResetDiscussionViewsModal extends Modal {\r\n init()\r\n {\r\n super.init();\r\n\r\n this.discussion = this.props.discussion;\r\n this.currentViewsCount = this.discussion.viewCount();\r\n }\r\n\r\n content()\r\n {\r\n return (\r\n \r\n
\r\n
{app.translator.transChoice('michaelbelgium-discussion-views.forum.modal_resetviews.label', this.currentViewsCount, {count: this.currentViewsCount })}
\r\n
\r\n {Button.component({\r\n className: 'Button Button--primary Button--block',\r\n type: 'submit',\r\n loading: this.loading,\r\n children: app.translator.trans('michaelbelgium-discussion-views.forum.modal_resetviews.submit_button')\r\n })}\r\n
\r\n
\r\n
\r\n {avatar(view.user())}\r\n
\r\n {userName}\r\n {humanTime(view.visitedAt())}\r\n
\r\n
\r\n
\r\n
{app.translator.transChoice('michaelbelgium-discussion-views.forum.modal_resetviews.label', this.currentViewsCount, {count: this.currentViewsCount })}
\r\n
\r\n {Button.component(\r\n {\r\n className: 'Button Button--primary Button--block',\r\n type: 'submit',\r\n loading: this.loading\r\n }, \r\n app.translator.trans('michaelbelgium-discussion-views.forum.modal_resetviews.submit_button')\r\n )}\r\n
\r\n
\r\n
\r\n {avatar(view.user())}\r\n
\r\n {userName}\r\n {humanTime(view.visitedAt())}\r\n
\r\n
- {Switch.component({
- state: this.setting('michaelbelgium-discussionviews.track_unique')() == 1,
- onchange: this.setting('michaelbelgium-discussionviews.track_unique'),
- children: app.translator.trans('michaelbelgium-discussion-views.admin.settings.track_unique_label')
- })}
+
+ {app.translator.trans('michaelbelgium-discussion-views.admin.settings.track_unique_label')}
+
- {Switch.component({
- state: this.setting('michaelbelgium-discussionviews.abbr_numbers')() == 1,
- onchange: this.setting('michaelbelgium-discussionviews.abbr_numbers'),
- children: app.translator.trans('michaelbelgium-discussion-views.admin.settings.abbr_numbers_label')
- })}
+
+ {app.translator.trans('michaelbelgium-discussion-views.admin.settings.abbr_numbers_label')}
+
- {Switch.component({
- state: this.setting('michaelbelgium-discussionviews.show_filter')() == 1,
- onchange: this.setting('michaelbelgium-discussionviews.show_filter'),
- children: app.translator.trans('michaelbelgium-discussion-views.admin.settings.show_filter_label')
- })}
+
+ {app.translator.trans('michaelbelgium-discussion-views.admin.settings.show_filter_label')}
+
- {Switch.component({
- state: this.setting('michaelbelgium-discussionviews.show_viewlist')() == 1,
- onchange: this.setting('michaelbelgium-discussionviews.show_viewlist'),
- children: app.translator.trans('michaelbelgium-discussion-views.admin.settings.show_viewlist_label')
- })}
+
+ {app.translator.trans('michaelbelgium-discussion-views.admin.settings.show_viewlist_label')}
+
,
- m('.Form-group', [
- m('label', app.translator.trans('michaelbelgium-discussion-views.admin.settings.max_viewcount_label')),
- m('input[type=number].FormControl', {
- bidi: this.setting('michaelbelgium-discussionviews.max_listcount'),
- min: 1
- })
- ])
+
+
+
+
];
}
}
\ No newline at end of file
diff --git a/js/src/admin/index.js b/js/src/admin/index.js
index 0217044..95e4bcf 100644
--- a/js/src/admin/index.js
+++ b/js/src/admin/index.js
@@ -21,5 +21,5 @@ app.initializers.add('michaelbelgium-admin-discussion-views', () => {
});
});
- app.extensionSettings['michaelbelgium-discussion-views'] = () => app.modal.show(new DiscussionviewSettingsModal());
+ app.extensionSettings['michaelbelgium-discussion-views'] = () => app.modal.show(DiscussionviewSettingsModal);
});
diff --git a/js/src/forum/components/AddModerationControl.js b/js/src/forum/components/AddModerationControl.js
index f8e2298..1fb24ce 100644
--- a/js/src/forum/components/AddModerationControl.js
+++ b/js/src/forum/components/AddModerationControl.js
@@ -7,17 +7,12 @@ export default function () {
extend(DiscussionControls, 'moderationControls', function(items, discussion) {
if(discussion.attribute('canReset') && discussion.viewCount() > 0)
{
- items.add('reset', Button.component({
- children: app.translator.trans('michaelbelgium-discussion-views.forum.discussion_controls.resetviews_button'),
- icon: 'far fa-eye-slash',
- onclick: this.resetViewsAction.bind(discussion)
- }));
+ items.add(
+ 'reset',
+
+ );
}
});
-
- DiscussionControls.resetViewsAction = function() {
- return app.modal.show(new ResetDiscussionViewsModal({
- discussion: this
- }));
- };
}
diff --git a/js/src/forum/components/AddPopularSort.js b/js/src/forum/components/AddPopularSort.js
index f32394d..f15a4c3 100644
--- a/js/src/forum/components/AddPopularSort.js
+++ b/js/src/forum/components/AddPopularSort.js
@@ -1,8 +1,8 @@
import { extend } from 'flarum/extend';
-import DiscussionList from 'flarum/components/DiscussionList';
+import DiscussionListState from 'flarum/states/DiscussionListState'
export default function () {
- extend(DiscussionList.prototype, 'sortMap', function (map) {
+ extend(DiscussionListState.prototype, 'sortMap', function (map) {
if(app.forum.attribute('mb-discussionviews.show_filter') == 1) {
map.popular = '-view_count';
map.unpopular = 'view_count';
diff --git a/js/src/forum/components/AddViewsToModelAndDisplay.js b/js/src/forum/components/AddViewsToModelAndDisplay.js
index 0fcb9e2..73cd6e3 100644
--- a/js/src/forum/components/AddViewsToModelAndDisplay.js
+++ b/js/src/forum/components/AddViewsToModelAndDisplay.js
@@ -20,11 +20,11 @@ export default function () {
Discussion.prototype.viewCount = Model.attribute('viewCount');
extend(DiscussionListItem.prototype, 'infoItems', function(items) {
- if(this.props.discussion.attribute('canViewNumber')) {
- const views = this.props.discussion.viewCount();
+ if(this.attrs.discussion.attribute('canViewNumber')) {
+ const views = this.attrs.discussion.viewCount();
var number = app.forum.attribute('mb-discussionviews.abbr_numbers') == 1 ? abbreviateNumber(views) : views;
- items.add('discussion-views', number);
+ items.add('discussion-views', {number});
}
});
@@ -57,10 +57,11 @@ export default function () {
viewList.add('lastUser-' + key, listitem);
});
- items.add('lastDiscussionViewers', FieldSet.component({
- label: app.translator.trans('michaelbelgium-discussion-views.forum.viewlist.title'),
- className: 'LastDiscussionUsers',
- children: viewList.toArray()
- }));
+ items.add(
+ 'lastDiscussionViewers',
+
+ );
});
}
diff --git a/js/src/forum/components/ResetDiscussionViewsModal.js b/js/src/forum/components/ResetDiscussionViewsModal.js
index 67fe914..e8c3f5a 100644
--- a/js/src/forum/components/ResetDiscussionViewsModal.js
+++ b/js/src/forum/components/ResetDiscussionViewsModal.js
@@ -2,11 +2,11 @@ import Modal from 'flarum/components/Modal';
import Button from 'flarum/components/Button';
export default class ResetDiscussionViewsModal extends Modal {
- init()
+ oninit(vnode)
{
- super.init();
+ super.oninit(vnode);
- this.discussion = this.props.discussion;
+ this.discussion = this.attrs.discussion;
this.currentViewsCount = this.discussion.viewCount();
}
@@ -17,12 +17,14 @@ export default class ResetDiscussionViewsModal extends Modal {
{app.translator.transChoice('michaelbelgium-discussion-views.forum.modal_resetviews.label', this.currentViewsCount, {count: this.currentViewsCount })}
- {Button.component({
- className: 'Button Button--primary Button--block',
- type: 'submit',
- loading: this.loading,
- children: app.translator.trans('michaelbelgium-discussion-views.forum.modal_resetviews.submit_button')
- })}
+ {Button.component(
+ {
+ className: 'Button Button--primary Button--block',
+ type: 'submit',
+ loading: this.loading
+ },
+ app.translator.trans('michaelbelgium-discussion-views.forum.modal_resetviews.submit_button')
+ )}
@@ -44,12 +46,10 @@ export default class ResetDiscussionViewsModal extends Modal {
e.preventDefault();
this.loading = true;
- this.props.discussion
+ this.attrs.discussion
.save({ resetViews: true })
- .then(() => { m.redraw(); })
- .catch((reason) => {
- this.loading = false;
- console.log(reason)
+ .catch(() => {
+ this.loaded();
});
this.hide();