{{#if showTop}}
- {{custom-html "top"}}
+ {{custom-html name="top"}}
{{/if}}
{{global-notice}}
{{create-topics-notice}}
{{outlet}}
- {{render "user-card"}}
+ {{outlet "user-card"}}
-
-
-
+
+
+
diff --git a/app/assets/images/favicons/google_branding/logo_docs_128px.png b/app/assets/images/favicons/google_branding/logo_docs_128px.png
deleted file mode 100644
index a1c4e5f7bd5..00000000000
Binary files a/app/assets/images/favicons/google_branding/logo_docs_128px.png and /dev/null differ
diff --git a/app/assets/images/favicons/google_branding/logo_docs_48px.png b/app/assets/images/favicons/google_branding/logo_docs_48px.png
new file mode 100644
index 00000000000..f1fe798f0ef
Binary files /dev/null and b/app/assets/images/favicons/google_branding/logo_docs_48px.png differ
diff --git a/app/assets/images/favicons/google_branding/logo_drive_128px.png b/app/assets/images/favicons/google_branding/logo_drive_128px.png
deleted file mode 100644
index 0eb48a7469f..00000000000
Binary files a/app/assets/images/favicons/google_branding/logo_drive_128px.png and /dev/null differ
diff --git a/app/assets/images/favicons/google_branding/logo_drive_48px.png b/app/assets/images/favicons/google_branding/logo_drive_48px.png
new file mode 100644
index 00000000000..ff595ca1e70
Binary files /dev/null and b/app/assets/images/favicons/google_branding/logo_drive_48px.png differ
diff --git a/app/assets/images/favicons/google_branding/logo_forms_128px.png b/app/assets/images/favicons/google_branding/logo_forms_128px.png
deleted file mode 100644
index 621321b0cf7..00000000000
Binary files a/app/assets/images/favicons/google_branding/logo_forms_128px.png and /dev/null differ
diff --git a/app/assets/images/favicons/google_branding/logo_forms_48px.png b/app/assets/images/favicons/google_branding/logo_forms_48px.png
new file mode 100644
index 00000000000..4ba7be23df4
Binary files /dev/null and b/app/assets/images/favicons/google_branding/logo_forms_48px.png differ
diff --git a/app/assets/images/favicons/google_branding/logo_sheets_128px.png b/app/assets/images/favicons/google_branding/logo_sheets_128px.png
deleted file mode 100644
index a99181d743d..00000000000
Binary files a/app/assets/images/favicons/google_branding/logo_sheets_128px.png and /dev/null differ
diff --git a/app/assets/images/favicons/google_branding/logo_sheets_48px.png b/app/assets/images/favicons/google_branding/logo_sheets_48px.png
new file mode 100644
index 00000000000..0a3cdc3c502
Binary files /dev/null and b/app/assets/images/favicons/google_branding/logo_sheets_48px.png differ
diff --git a/app/assets/images/favicons/google_branding/logo_slides_128px.png b/app/assets/images/favicons/google_branding/logo_slides_128px.png
deleted file mode 100644
index 538226c80f4..00000000000
Binary files a/app/assets/images/favicons/google_branding/logo_slides_128px.png and /dev/null differ
diff --git a/app/assets/images/favicons/google_branding/logo_slides_48px.png b/app/assets/images/favicons/google_branding/logo_slides_48px.png
new file mode 100644
index 00000000000..66b5155d690
Binary files /dev/null and b/app/assets/images/favicons/google_branding/logo_slides_48px.png differ
diff --git a/app/assets/javascripts/admin/adapters/web-hook-event.js.es6 b/app/assets/javascripts/admin/adapters/web-hook-event.js.es6
new file mode 100644
index 00000000000..122070ce3e4
--- /dev/null
+++ b/app/assets/javascripts/admin/adapters/web-hook-event.js.es6
@@ -0,0 +1,7 @@
+import RESTAdapter from 'discourse/adapters/rest';
+
+export default RESTAdapter.extend({
+ basePath() {
+ return '/admin/api/';
+ }
+});
diff --git a/app/assets/javascripts/admin/adapters/web-hook.js.es6 b/app/assets/javascripts/admin/adapters/web-hook.js.es6
new file mode 100644
index 00000000000..122070ce3e4
--- /dev/null
+++ b/app/assets/javascripts/admin/adapters/web-hook.js.es6
@@ -0,0 +1,7 @@
+import RESTAdapter from 'discourse/adapters/rest';
+
+export default RESTAdapter.extend({
+ basePath() {
+ return '/admin/api/';
+ }
+});
diff --git a/app/assets/javascripts/admin/components/ace-editor.js.es6 b/app/assets/javascripts/admin/components/ace-editor.js.es6
index f9be6416406..a03865c40ce 100644
--- a/app/assets/javascripts/admin/components/ace-editor.js.es6
+++ b/app/assets/javascripts/admin/components/ace-editor.js.es6
@@ -1,6 +1,5 @@
-/* global ace:true */
import loadScript from 'discourse/lib/load-script';
-import { escapeExpression } from 'discourse/lib/utilities';
+import { observes } from 'ember-addons/ember-computed-decorators';
export default Ember.Component.extend({
mode: 'css',
@@ -8,18 +7,11 @@ export default Ember.Component.extend({
_editor: null,
_skipContentChangeEvent: null,
- contentChanged: function() {
+ @observes('content')
+ contentChanged() {
if (this._editor && !this._skipContentChangeEvent) {
this._editor.getSession().setValue(this.get('content'));
}
- }.observes('content'),
-
- render(buffer) {
- buffer.push("");
@@ -40,14 +50,8 @@ export default Ember.View.extend({
buffer.push("" + I18n.t("admin.backups.logs.none") + "
");
}
// add a loading indicator
- if (this.get("controller.status.model.isOperationRunning")) {
+ if (this.get("status.isOperationRunning")) {
buffer.push(renderSpinner('small'));
}
- },
-
- _forceScrollToBottom: function() {
- const $div = this.$()[0];
- $div.scrollTop = $div.scrollHeight;
- }.on("didInsertElement")
-
-});
+ }
+}));
diff --git a/app/assets/javascripts/admin/components/admin-web-hook-event-chooser.js.es6 b/app/assets/javascripts/admin/components/admin-web-hook-event-chooser.js.es6
new file mode 100644
index 00000000000..976b483995e
--- /dev/null
+++ b/app/assets/javascripts/admin/components/admin-web-hook-event-chooser.js.es6
@@ -0,0 +1,42 @@
+import computed from 'ember-addons/ember-computed-decorators';
+
+export default Ember.Component.extend({
+ classNames: ['hook-event'],
+ typeName: Ember.computed.alias('type.name'),
+
+ @computed('typeName')
+ name(typeName) {
+ return I18n.t(`admin.web_hooks.${typeName}_event.name`);
+ },
+
+ @computed('typeName')
+ details(typeName) {
+ return I18n.t(`admin.web_hooks.${typeName}_event.details`);
+ },
+
+ @computed('model.[]', 'typeName')
+ eventTypeExists(eventTypes, typeName) {
+ return eventTypes.any(event => event.name === typeName);
+ },
+
+ @computed('eventTypeExists')
+ enabled: {
+ get(eventTypeExists) {
+ return eventTypeExists;
+ },
+ set(value, eventTypeExists) {
+ const type = this.get('type');
+ const model = this.get('model');
+ // add an association when not exists
+ if (value !== eventTypeExists) {
+ if (value) {
+ model.addObject(type);
+ } else {
+ model.removeObjects(model.filter(eventType => eventType.name === type.name));
+ }
+ }
+
+ return value;
+ }
+ }
+});
diff --git a/app/assets/javascripts/admin/components/admin-web-hook-event.js.es6 b/app/assets/javascripts/admin/components/admin-web-hook-event.js.es6
new file mode 100644
index 00000000000..264e827da61
--- /dev/null
+++ b/app/assets/javascripts/admin/components/admin-web-hook-event.js.es6
@@ -0,0 +1,78 @@
+import computed from 'ember-addons/ember-computed-decorators';
+import { ajax } from 'discourse/lib/ajax';
+import { popupAjaxError } from 'discourse/lib/ajax-error';
+import { ensureJSON, plainJSON, prettyJSON } from 'discourse/lib/formatter';
+
+export default Ember.Component.extend({
+ tagName: 'li',
+ expandDetails: null,
+
+ @computed('model.status')
+ statusColorClasses(status) {
+ if (!status) return '';
+
+ if (status >= 200 && status <= 299) {
+ return 'text-successful';
+ } else {
+ return 'text-danger';
+ }
+ },
+
+ @computed('model.created_at')
+ createdAt(createdAt) {
+ return moment(createdAt).format('YYYY-MM-DD HH:mm:ss');
+ },
+
+ @computed('model.duration')
+ completion(duration) {
+ const seconds = Math.floor(duration / 10.0) / 100.0;
+ return I18n.t('admin.web_hooks.events.completed_in', { count: seconds });
+ },
+
+ actions: {
+ redeliver() {
+ return bootbox.confirm(I18n.t('admin.web_hooks.events.redeliver_confirm'), I18n.t('no_value'), I18n.t('yes_value'), result => {
+ if (result) {
+ ajax(`/admin/api/web_hooks/${this.get('model.web_hook_id')}/events/${this.get('model.id')}/redeliver`, { type: 'POST' }).then(json => {
+ this.set('model', json.web_hook_event);
+ }).catch(popupAjaxError);
+ }
+ });
+ },
+
+ toggleRequest() {
+ const expandDetailsKey = 'request';
+
+ if (this.get('expandDetails') !== expandDetailsKey) {
+ let headers = _.extend({
+ 'Request URL': this.get('model.request_url'),
+ 'Request method': 'POST'
+ }, ensureJSON(this.get('model.headers')));
+ this.setProperties({
+ headers: plainJSON(headers),
+ body: prettyJSON(this.get('model.payload')),
+ expandDetails: expandDetailsKey,
+ bodyLabel: I18n.t('admin.web_hooks.events.payload')
+ });
+ } else {
+ this.set('expandDetails', null);
+ }
+ },
+
+ toggleResponse() {
+ const expandDetailsKey = 'response';
+
+ if (this.get('expandDetails') !== expandDetailsKey) {
+ this.setProperties({
+ headers: plainJSON(this.get('model.response_headers')),
+ body: this.get('model.response_body'),
+ expandDetails: expandDetailsKey,
+ bodyLabel: I18n.t('admin.web_hooks.events.body')
+ });
+ } else {
+ this.set('expandDetails', null);
+ }
+ }
+ }
+
+});
diff --git a/app/assets/javascripts/admin/components/admin-web-hook-status.js.es6 b/app/assets/javascripts/admin/components/admin-web-hook-status.js.es6
new file mode 100644
index 00000000000..d176b5a40ab
--- /dev/null
+++ b/app/assets/javascripts/admin/components/admin-web-hook-status.js.es6
@@ -0,0 +1,28 @@
+import computed from 'ember-addons/ember-computed-decorators';
+import { iconHTML } from 'discourse-common/helpers/fa-icon';
+import { bufferedRender } from 'discourse-common/lib/buffered-render';
+
+export default Ember.Component.extend(bufferedRender({
+ classes: ["text-muted", "text-danger", "text-successful"],
+ icons: ["circle-o", "times-circle", "circle"],
+
+ @computed('deliveryStatuses', 'model.last_delivery_status')
+ status(deliveryStatuses, lastDeliveryStatus) {
+ return deliveryStatuses.find(s => s.id === lastDeliveryStatus);
+ },
+
+ @computed('status.id', 'icons')
+ icon(statusId, icons) {
+ return icons[statusId - 1];
+ },
+
+ @computed('status.id', 'classes')
+ class(statusId, classes) {
+ return classes[statusId - 1];
+ },
+
+ buildBuffer(buffer) {
+ buffer.push(iconHTML(this.get('icon'), { class: this.get('class') }));
+ buffer.push(I18n.t(`admin.web_hooks.delivery_status.${this.get('status.name')}`));
+ }
+}));
diff --git a/app/assets/javascripts/admin/components/customize-link.js.es6 b/app/assets/javascripts/admin/components/customize-link.js.es6
index 79d8cc26f4a..0600f6b5cdb 100644
--- a/app/assets/javascripts/admin/components/customize-link.js.es6
+++ b/app/assets/javascripts/admin/components/customize-link.js.es6
@@ -1,6 +1,8 @@
+import { getOwner } from 'discourse-common/lib/get-owner';
+
export default Ember.Component.extend({
router: function() {
- return this.container.lookup('router:main');
+ return getOwner(this).lookup('router:main');
}.property(),
active: function() {
diff --git a/app/assets/javascripts/admin/views/admin.js.es6 b/app/assets/javascripts/admin/components/disable-custom-stylesheets.js.es6
similarity index 53%
rename from app/assets/javascripts/admin/views/admin.js.es6
rename to app/assets/javascripts/admin/components/disable-custom-stylesheets.js.es6
index fc4a611fe47..f4d86899d08 100644
--- a/app/assets/javascripts/admin/views/admin.js.es6
+++ b/app/assets/javascripts/admin/components/disable-custom-stylesheets.js.es6
@@ -1,12 +1,14 @@
-export default Ember.View.extend({
- _disableCustomStylesheets: function() {
+export default Ember.Component.extend({
+ willInsertElement() {
+ this._super();
if (this.session.get("disableCustomCSS")) {
$("link.custom-css").attr("rel", "");
this.session.set("disableCustomCSS", false);
}
- }.on("willInsertElement"),
+ },
- _enableCustomStylesheets: function() {
+ willDestroyElement() {
+ this._super();
$("link.custom-css").attr("rel", "stylesheet");
- }.on("willDestroyElement")
+ }
});
diff --git a/app/assets/javascripts/admin/components/embeddable-host.js.es6 b/app/assets/javascripts/admin/components/embeddable-host.js.es6
index f33c7509657..2a5d7c030b4 100644
--- a/app/assets/javascripts/admin/components/embeddable-host.js.es6
+++ b/app/assets/javascripts/admin/components/embeddable-host.js.es6
@@ -30,10 +30,11 @@ export default Ember.Component.extend(bufferedProperty('host'), {
save() {
if (this.get('cantSave')) { return; }
- const props = this.get('buffered').getProperties('host');
+ const props = this.get('buffered').getProperties('host', 'path_whitelist');
props.category_id = this.get('categoryId');
const host = this.get('host');
+
host.save(props).then(() => {
host.set('category', Discourse.Category.findById(this.get('categoryId')));
this.set('editToggled', false);
diff --git a/app/assets/javascripts/admin/components/permalinks-list.js.es6 b/app/assets/javascripts/admin/components/permalinks-list.js.es6
deleted file mode 100644
index c4254376862..00000000000
--- a/app/assets/javascripts/admin/components/permalinks-list.js.es6
+++ /dev/null
@@ -1,8 +0,0 @@
-import ListView from 'ember-addons/list-view';
-import ListItemView from 'ember-addons/list-item-view';
-
-export default ListView.extend({
- height: 700,
- rowHeight: 32,
- itemViewClass: ListItemView.extend({templateName: "admin/templates/permalinks_list_item"})
-});
diff --git a/app/assets/javascripts/admin/components/resumable-upload.js.es6 b/app/assets/javascripts/admin/components/resumable-upload.js.es6
index ea2f02cfa05..73a46eded3c 100644
--- a/app/assets/javascripts/admin/components/resumable-upload.js.es6
+++ b/app/assets/javascripts/admin/components/resumable-upload.js.es6
@@ -1,3 +1,5 @@
+import { bufferedRender } from 'discourse-common/lib/buffered-render';
+
/*global Resumable:true */
/**
@@ -10,7 +12,7 @@
uploadText="UPLOAD"
}}
**/
-const ResumableUploadComponent = Ember.Component.extend(Discourse.StringBuffer, {
+export default Ember.Component.extend(bufferedRender({
tagName: "button",
classNames: ["btn", "ru"],
classNameBindings: ["isUploading"],
@@ -36,9 +38,9 @@ const ResumableUploadComponent = Ember.Component.extend(Discourse.StringBuffer,
}
}.property("isUploading", "progress"),
- renderString: function(buffer) {
- var icon = this.get("isUploading") ? "times" : "upload";
- buffer.push("");
+ buildBuffer(buffer) {
+ const icon = this.get("isUploading") ? "times" : "upload";
+ buffer.push(``);
buffer.push("" + this.get("text") + "");
buffer.push("");
},
@@ -117,6 +119,4 @@ const ResumableUploadComponent = Ember.Component.extend(Discourse.StringBuffer,
}
}.on("willDestroyElement")
-});
-
-export default ResumableUploadComponent;
+}));
diff --git a/app/assets/javascripts/admin/components/screened-emails-list.js.es6 b/app/assets/javascripts/admin/components/screened-emails-list.js.es6
deleted file mode 100644
index 1b32fb36fe9..00000000000
--- a/app/assets/javascripts/admin/components/screened-emails-list.js.es6
+++ /dev/null
@@ -1,8 +0,0 @@
-import ListView from 'ember-addons/list-view';
-import ListItemView from 'ember-addons/list-item-view';
-
-export default ListView.extend({
- height: 700,
- rowHeight: 32,
- itemViewClass: ListItemView.extend({templateName: "admin/templates/logs/screened_emails_list_item"})
-});
diff --git a/app/assets/javascripts/admin/components/screened-ip-addresses-list.js.es6 b/app/assets/javascripts/admin/components/screened-ip-addresses-list.js.es6
deleted file mode 100644
index 0d30fc6d48d..00000000000
--- a/app/assets/javascripts/admin/components/screened-ip-addresses-list.js.es6
+++ /dev/null
@@ -1,8 +0,0 @@
-import ListView from 'ember-addons/list-view';
-import ListItemView from 'ember-addons/list-item-view';
-
-export default ListView.extend({
- height: 700,
- rowHeight: 32,
- itemViewClass: ListItemView.extend({templateName: "admin/templates/logs/screened_ip_addresses_list_item"})
-});
diff --git a/app/assets/javascripts/admin/components/screened-urls-list.js.es6 b/app/assets/javascripts/admin/components/screened-urls-list.js.es6
deleted file mode 100644
index b9d8b76667e..00000000000
--- a/app/assets/javascripts/admin/components/screened-urls-list.js.es6
+++ /dev/null
@@ -1,8 +0,0 @@
-import ListView from 'ember-addons/list-view';
-import ListItemView from 'ember-addons/list-item-view';
-
-export default ListView.extend({
- height: 700,
- rowHeight: 32,
- itemViewClass: ListItemView.extend({templateName: "admin/templates/logs/screened_urls_list_item"})
-});
diff --git a/app/assets/javascripts/admin/components/site-setting.js.es6 b/app/assets/javascripts/admin/components/site-setting.js.es6
index 8b6601b4d37..662e4ef684c 100644
--- a/app/assets/javascripts/admin/components/site-setting.js.es6
+++ b/app/assets/javascripts/admin/components/site-setting.js.es6
@@ -1,12 +1,11 @@
import BufferedContent from 'discourse/mixins/buffered-content';
-import ScrollTop from 'discourse/mixins/scroll-top';
import SiteSetting from 'admin/models/site-setting';
import { propertyNotEqual } from 'discourse/lib/computed';
import computed from 'ember-addons/ember-computed-decorators';
const CustomTypes = ['bool', 'enum', 'list', 'url_list', 'host_list', 'category_list', 'value_list'];
-export default Ember.Component.extend(BufferedContent, ScrollTop, {
+export default Ember.Component.extend(BufferedContent, {
classNameBindings: [':row', ':setting', 'setting.overridden', 'typeClass'],
content: Ember.computed.alias('setting'),
dirty: propertyNotEqual('buffered.value', 'setting.value'),
diff --git a/app/assets/javascripts/admin/components/staff-action-logs-list.js.es6 b/app/assets/javascripts/admin/components/staff-action-logs-list.js.es6
deleted file mode 100644
index cec82dba432..00000000000
--- a/app/assets/javascripts/admin/components/staff-action-logs-list.js.es6
+++ /dev/null
@@ -1,8 +0,0 @@
-import ListView from 'ember-addons/list-view';
-import ListItemView from 'ember-addons/list-item-view';
-
-export default ListView.extend({
- height: 700,
- rowHeight: 75,
- itemViewClass: ListItemView.extend({templateName: "admin/templates/logs/staff_action_logs_list_item"})
-});
diff --git a/app/assets/javascripts/admin/controllers/admin-api-keys.js.es6 b/app/assets/javascripts/admin/controllers/admin-api-keys.js.es6
new file mode 100644
index 00000000000..529538263c8
--- /dev/null
+++ b/app/assets/javascripts/admin/controllers/admin-api-keys.js.es6
@@ -0,0 +1,32 @@
+import ApiKey from 'admin/models/api-key';
+
+export default Ember.Controller.extend({
+
+ actions: {
+ generateMasterKey() {
+ ApiKey.generateMasterKey().then(key => this.get('model').pushObject(key));
+ },
+
+ regenerateKey(key) {
+ bootbox.confirm(I18n.t("admin.api.confirm_regen"), I18n.t("no_value"), I18n.t("yes_value"), result => {
+ if (result) {
+ key.regenerate();
+ }
+ });
+ },
+
+ revokeKey(key) {
+ bootbox.confirm(I18n.t("admin.api.confirm_revoke"), I18n.t("no_value"), I18n.t("yes_value"), result => {
+ if (result) {
+ key.revoke().then(() => this.get('model').removeObject(key));
+ }
+ });
+ }
+ },
+
+ // Has a master key already been generated?
+ hasMasterKey: function() {
+ return !!this.get('model').findBy('user', null);
+ }.property('model.[]')
+
+});
diff --git a/app/assets/javascripts/admin/controllers/admin-api.js.es6 b/app/assets/javascripts/admin/controllers/admin-api.js.es6
deleted file mode 100644
index 82366d3bd78..00000000000
--- a/app/assets/javascripts/admin/controllers/admin-api.js.es6
+++ /dev/null
@@ -1,68 +0,0 @@
-import ApiKey from 'admin/models/api-key';
-
-/**
- This controller supports the interface for dealing with API keys
-
- @class AdminApiController
- @extends Ember.ArrayController
- @namespace Discourse
- @module Discourse
-**/
-export default Ember.ArrayController.extend({
-
- actions: {
- /**
- Generates a master api key
-
- @method generateMasterKey
- **/
- generateMasterKey: function() {
- var self = this;
- ApiKey.generateMasterKey().then(function (key) {
- self.get('model').pushObject(key);
- });
- },
-
- /**
- Creates an API key instance with internal user object
-
- @method regenerateKey
- @param {ApiKey} key the key to regenerate
- **/
- regenerateKey: function(key) {
- bootbox.confirm(I18n.t("admin.api.confirm_regen"), I18n.t("no_value"), I18n.t("yes_value"), function(result) {
- if (result) {
- key.regenerate();
- }
- });
- },
-
- /**
- Revokes an API key
-
- @method revokeKey
- @param {ApiKey} key the key to revoke
- **/
- revokeKey: function(key) {
- var self = this;
- bootbox.confirm(I18n.t("admin.api.confirm_revoke"), I18n.t("no_value"), I18n.t("yes_value"), function(result) {
- if (result) {
- key.revoke().then(function() {
- self.get('model').removeObject(key);
- });
- }
- });
- }
- },
-
- /**
- Has a master key already been generated?
-
- @property hasMasterKey
- @type {Boolean}
- **/
- hasMasterKey: function() {
- return !!this.get('model').findBy('user', null);
- }.property('model.[]')
-
-});
diff --git a/app/assets/javascripts/admin/controllers/admin-backups-index.js.es6 b/app/assets/javascripts/admin/controllers/admin-backups-index.js.es6
index 98f76405a2f..558b9b4973e 100644
--- a/app/assets/javascripts/admin/controllers/admin-backups-index.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-backups-index.js.es6
@@ -1,19 +1,21 @@
+import DiscourseURL from 'discourse/lib/url';
import { ajax } from 'discourse/lib/ajax';
-export default Ember.ArrayController.extend({
- needs: ["adminBackups"],
- status: Ember.computed.alias("controllers.adminBackups"),
+
+export default Ember.Controller.extend({
+ adminBackups: Ember.inject.controller(),
+ status: Ember.computed.alias('adminBackups.model'),
uploadLabel: function() { return I18n.t("admin.backups.upload.label"); }.property(),
restoreTitle: function() {
- if (!this.get('status.model.allowRestore')) {
+ if (!this.get('status.allowRestore')) {
return "admin.backups.operations.restore.is_disabled";
- } else if (this.get("status.model.isOperationRunning")) {
+ } else if (this.get("status.isOperationRunning")) {
return "admin.backups.operations.is_running";
} else {
return "admin.backups.operations.restore.title";
}
- }.property("status.model.{allowRestore,isOperationRunning}"),
+ }.property("status.{allowRestore,isOperationRunning}"),
actions: {
@@ -34,8 +36,11 @@ export default Ember.ArrayController.extend({
} else {
this._toggleReadOnlyMode(false);
}
- }
+ },
+ download(backup) {
+ DiscourseURL.redirectTo(backup.get('link'));
+ }
},
_toggleReadOnlyMode(enable) {
diff --git a/app/assets/javascripts/admin/controllers/admin-backups-logs.js.es6 b/app/assets/javascripts/admin/controllers/admin-backups-logs.js.es6
index 1b3d90346a1..38bdd6f5713 100644
--- a/app/assets/javascripts/admin/controllers/admin-backups-logs.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-backups-logs.js.es6
@@ -1,4 +1,5 @@
-export default Ember.ArrayController.extend({
- needs: ["adminBackups"],
- status: Em.computed.alias("controllers.adminBackups")
+export default Ember.Controller.extend({
+ logs: [],
+ adminBackups: Ember.inject.controller(),
+ status: Em.computed.alias("adminBackups.model")
});
diff --git a/app/assets/javascripts/admin/controllers/admin-badges-show.js.es6 b/app/assets/javascripts/admin/controllers/admin-badges-show.js.es6
index 5ec2cb45410..7ddc6f3ac4e 100644
--- a/app/assets/javascripts/admin/controllers/admin-badges-show.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-badges-show.js.es6
@@ -3,14 +3,14 @@ import BufferedContent from 'discourse/mixins/buffered-content';
import { propertyNotEqual } from 'discourse/lib/computed';
export default Ember.Controller.extend(BufferedContent, {
- needs: ['admin-badges'],
+ adminBadges: Ember.inject.controller(),
saving: false,
savingStatus: '',
- badgeTypes: Em.computed.alias('controllers.admin-badges.badgeTypes'),
- badgeGroupings: Em.computed.alias('controllers.admin-badges.badgeGroupings'),
- badgeTriggers: Em.computed.alias('controllers.admin-badges.badgeTriggers'),
- protectedSystemFields: Em.computed.alias('controllers.admin-badges.protectedSystemFields'),
+ badgeTypes: Ember.computed.alias('adminBadges.badgeTypes'),
+ badgeGroupings: Ember.computed.alias('adminBadges.badgeGroupings'),
+ badgeTriggers: Ember.computed.alias('adminBadges.badgeTriggers'),
+ protectedSystemFields: Ember.computed.alias('adminBadges.protectedSystemFields'),
readOnly: Ember.computed.alias('buffered.system'),
showDisplayName: propertyNotEqual('name', 'displayName'),
@@ -30,16 +30,15 @@ export default Ember.Controller.extend(BufferedContent, {
}.observes('model.id'),
actions: {
- save: function() {
+ save() {
if (!this.get('saving')) {
- var fields = ['allow_title', 'multiple_grant',
- 'listable', 'auto_revoke',
- 'enabled', 'show_posts',
- 'target_posts', 'name', 'description',
- 'long_description',
- 'icon', 'image', 'query', 'badge_grouping_id',
- 'trigger', 'badge_type_id'],
- self = this;
+ let fields = ['allow_title', 'multiple_grant',
+ 'listable', 'auto_revoke',
+ 'enabled', 'show_posts',
+ 'target_posts', 'name', 'description',
+ 'long_description',
+ 'icon', 'image', 'query', 'badge_grouping_id',
+ 'trigger', 'badge_type_id'];
if (this.get('buffered.system')){
var protectedFields = this.get('protectedSystemFields');
@@ -51,54 +50,55 @@ export default Ember.Controller.extend(BufferedContent, {
this.set('saving', true);
this.set('savingStatus', I18n.t('saving'));
- var boolFields = ['allow_title', 'multiple_grant',
- 'listable', 'auto_revoke',
- 'enabled', 'show_posts',
- 'target_posts' ];
+ const boolFields = ['allow_title', 'multiple_grant',
+ 'listable', 'auto_revoke',
+ 'enabled', 'show_posts',
+ 'target_posts' ];
- var data = {},
- buffered = this.get('buffered');
+ const data = {};
+ const buffered = this.get('buffered');
fields.forEach(function(field){
var d = buffered.get(field);
if (_.include(boolFields, field)) { d = !!d; }
data[field] = d;
});
- var newBadge = !this.get('id'),
- model = this.get('model');
- this.get('model').save(data).then(function() {
+ const newBadge = !this.get('id');
+ const model = this.get('model');
+ this.get('model').save(data).then(() => {
if (newBadge) {
- var adminBadgesController = self.get('controllers.admin-badges');
- if (!adminBadgesController.contains(model)) adminBadgesController.pushObject(model);
- self.transitionToRoute('adminBadges.show', model.get('id'));
+ const adminBadges = this.get('adminBadges.model');
+ if (!adminBadges.includes(model)) {
+ adminBadges.pushObject(model);
+ }
+ this.transitionToRoute('adminBadges.show', model.get('id'));
} else {
- self.commitBuffer();
- self.set('savingStatus', I18n.t('saved'));
+ this.commitBuffer();
+ this.set('savingStatus', I18n.t('saved'));
}
- }).catch(popupAjaxError).finally(function() {
- self.set('saving', false);
- self.set('savingStatus', '');
+ }).catch(popupAjaxError).finally(() => {
+ this.set('saving', false);
+ this.set('savingStatus', '');
});
}
},
- destroy: function() {
- var self = this,
- adminBadgesController = this.get('controllers.admin-badges'),
- model = this.get('model');
+ destroy() {
+ const adminBadges = this.get('adminBadges.model');
+ const model = this.get('model');
if (!model.get('id')) {
- self.transitionToRoute('adminBadges.index');
+ this.transitionToRoute('adminBadges.index');
return;
}
- return bootbox.confirm(I18n.t("admin.badges.delete_confirm"), I18n.t("no_value"), I18n.t("yes_value"), function(result) {
+ return bootbox.confirm(I18n.t("admin.badges.delete_confirm"), I18n.t("no_value"), I18n.t("yes_value"), result => {
if (result) {
- model.destroy().then(function() {
- adminBadgesController.removeObject(model);
- self.transitionToRoute('adminBadges.index');
- }).catch(function() {
+ model.destroy().then(() => {
+ adminBadges.removeObject(model);
+ this.transitionToRoute('adminBadges.index');
+ }).catch(() => {
bootbox.alert(I18n.t('generic_error'));
});
}
diff --git a/app/assets/javascripts/admin/controllers/admin-badges.js.es6 b/app/assets/javascripts/admin/controllers/admin-badges.js.es6
index 24c4c051390..77c79b724a7 100644
--- a/app/assets/javascripts/admin/controllers/admin-badges.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-badges.js.es6
@@ -1 +1 @@
-export default Ember.ArrayController.extend();
+export default Ember.Controller.extend();
diff --git a/app/assets/javascripts/admin/controllers/admin-customize-colors.js.es6 b/app/assets/javascripts/admin/controllers/admin-customize-colors.js.es6
index 4a6a58021bb..ae253aec843 100644
--- a/app/assets/javascripts/admin/controllers/admin-customize-colors.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-customize-colors.js.es6
@@ -1,4 +1,4 @@
-export default Ember.ArrayController.extend({
+export default Ember.Controller.extend({
onlyOverridden: false,
baseColorScheme: function() {
@@ -13,8 +13,8 @@ export default Ember.ArrayController.extend({
return baseColorsHash;
}.property('baseColorScheme'),
- removeSelected: function() {
- this.removeObject(this.get('selectedItem'));
+ removeSelected() {
+ this.get('model').removeObject(this.get('selectedItem'));
this.set('selectedItem', null);
},
@@ -26,8 +26,7 @@ export default Ember.ArrayController.extend({
return;
}
- var matches = Em.A();
-
+ const matches = [];
_.each(this.get('selectedItem.colors'), function(color){
if (color.get('overridden')) matches.pushObject(color);
});
@@ -58,10 +57,10 @@ export default Ember.ArrayController.extend({
this.filterContent();
},
- newColorScheme: function() {
- var newColorScheme = Em.copy(this.get('baseColorScheme'), true);
+ newColorScheme() {
+ const newColorScheme = Em.copy(this.get('baseColorScheme'), true);
newColorScheme.set('name', I18n.t('admin.customize.colors.new_name'));
- this.pushObject(newColorScheme);
+ this.get('model').pushObject(newColorScheme);
this.send('selectColorScheme', newColorScheme);
this.set('onlyOverridden', false);
},
@@ -86,10 +85,10 @@ export default Ember.ArrayController.extend({
this.updateEnabled();
},
- copy: function(colorScheme) {
+ copy(colorScheme) {
var newColorScheme = Em.copy(colorScheme, true);
newColorScheme.set('name', I18n.t('admin.customize.colors.copy_name_prefix') + ' ' + colorScheme.get('name'));
- this.pushObject(newColorScheme);
+ this.get('model').pushObject(newColorScheme);
this.send('selectColorScheme', newColorScheme);
},
diff --git a/app/assets/javascripts/admin/controllers/admin-customize-css-html-show.js.es6 b/app/assets/javascripts/admin/controllers/admin-customize-css-html-show.js.es6
index 03c855a969c..47cf280ae6c 100644
--- a/app/assets/javascripts/admin/controllers/admin-customize-css-html-show.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-customize-css-html-show.js.es6
@@ -33,7 +33,7 @@ export default Ember.Controller.extend(activeSections, {
return !this.get('model.changed') || this.get('model.isSaving');
}.property('model.changed', 'model.isSaving'),
- needs: ['adminCustomizeCssHtml'],
+ adminCustomizeCssHtml: Ember.inject.controller(),
undoPreviewUrl: url('/?preview-style='),
defaultStyleUrl: url('/?preview-style=default'),
@@ -44,13 +44,12 @@ export default Ember.Controller.extend(activeSections, {
},
destroy() {
- const self = this;
- return bootbox.confirm(I18n.t("admin.customize.delete_confirm"), I18n.t("no_value"), I18n.t("yes_value"), function(result) {
+ return bootbox.confirm(I18n.t("admin.customize.delete_confirm"), I18n.t("no_value"), I18n.t("yes_value"), result => {
if (result) {
- const model = self.get('model');
- model.destroyRecord().then(function() {
- self.get('controllers.adminCustomizeCssHtml').get('model').removeObject(model);
- self.transitionToRoute('adminCustomizeCssHtml');
+ const model = this.get('model');
+ model.destroyRecord().then(() => {
+ this.get('adminCustomizeCssHtml').get('model').removeObject(model);
+ this.transitionToRoute('adminCustomizeCssHtml');
});
}
});
diff --git a/app/assets/javascripts/admin/controllers/admin-dashboard.js.es6 b/app/assets/javascripts/admin/controllers/admin-dashboard.js.es6
index 82cedfee59b..2e39c158802 100644
--- a/app/assets/javascripts/admin/controllers/admin-dashboard.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-dashboard.js.es6
@@ -22,7 +22,7 @@ export default Ember.Controller.extend({
@computed('problems.length')
foundProblems(problemsLength) {
- return this.currentUser.get('admin') && (problemsLength || 0) > 1;
+ return this.currentUser.get('admin') && (problemsLength || 0) > 0;
},
@computed('foundProblems')
diff --git a/app/assets/javascripts/admin/controllers/admin-email-preview-digest.js.es6 b/app/assets/javascripts/admin/controllers/admin-email-preview-digest.js.es6
index 160f998365b..5da4b0afb58 100644
--- a/app/assets/javascripts/admin/controllers/admin-email-preview-digest.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-email-preview-digest.js.es6
@@ -1,12 +1,23 @@
import EmailPreview from 'admin/models/email-preview';
+import { popupAjaxError } from 'discourse/lib/ajax-error';
export default Ember.Controller.extend({
+ emailEmpty: Em.computed.empty('email'),
+ sendEmailDisabled: Em.computed.or('emailEmpty', 'sendingEmail'),
+ showSendEmailForm: Em.computed.notEmpty('model.html_content'),
+ htmlEmpty: Em.computed.empty('model.html_content'),
+
+ iframeSrc: function() {
+ return ('data:text/html;charset=utf-8,' + encodeURI(this.get('model.html_content')));
+ }.property('model.html_content'),
+
actions: {
refresh() {
const model = this.get('model');
this.set('loading', true);
+ this.set('sentEmail', false);
EmailPreview.findDigest(this.get('lastSeen'), this.get('username')).then(email => {
model.setProperties(email.getProperties('html_content', 'text_content'));
this.set('loading', false);
@@ -15,6 +26,23 @@ export default Ember.Controller.extend({
toggleShowHtml() {
this.toggleProperty('showHtml');
+ },
+
+ sendEmail() {
+ this.set('sendingEmail', true);
+ this.set('sentEmail', false);
+
+ const self = this;
+
+ EmailPreview.sendDigest(this.get('lastSeen'), this.get('username'), this.get('email')).then(result => {
+ if (result.errors) {
+ bootbox.alert(result.errors);
+ } else {
+ self.set('sentEmail', true);
+ }
+ }).catch(popupAjaxError).finally(function() {
+ self.set('sendingEmail', false);
+ });
}
}
diff --git a/app/assets/javascripts/admin/controllers/admin-embedding.js.es6 b/app/assets/javascripts/admin/controllers/admin-embedding.js.es6
index 780c61f3f91..266aa6975e6 100644
--- a/app/assets/javascripts/admin/controllers/admin-embedding.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-embedding.js.es6
@@ -9,7 +9,7 @@ export default Ember.Controller.extend({
@computed('embedding.embeddable_hosts.@each.isCreated')
showSecondary() {
const hosts = this.get('embedding.embeddable_hosts');
- return hosts.length && hosts.findProperty('isCreated');
+ return hosts.length && hosts.findBy('isCreated');
},
@computed('embedding.base_url')
@@ -38,9 +38,7 @@ export default Ember.Controller.extend({
const updates = embedding.getProperties(embedding.get('fields'));
this.set('saved', false);
- this.get('embedding').update(updates).then(() => {
- this.set('saved', true);
- }).catch(popupAjaxError);
+ this.get('embedding').update(updates).then(() => this.set('saved', true)).catch(popupAjaxError);
},
addHost() {
diff --git a/app/assets/javascripts/admin/controllers/admin-emojis.js.es6 b/app/assets/javascripts/admin/controllers/admin-emojis.js.es6
index b111a5952ba..29aecc47734 100644
--- a/app/assets/javascripts/admin/controllers/admin-emojis.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-emojis.js.es6
@@ -1,23 +1,23 @@
import { ajax } from 'discourse/lib/ajax';
-export default Ember.ArrayController.extend({
- sortProperties: ["name"],
+export default Ember.Controller.extend({
+ sortedEmojis: Ember.computed.sort('model', 'emojiSorting'),
+ emojiSorting: ['name'],
actions: {
emojiUploaded(emoji) {
emoji.url += "?t=" + new Date().getTime();
- this.pushObject(Ember.Object.create(emoji));
+ this.get('model').pushObject(Ember.Object.create(emoji));
},
destroy(emoji) {
- const self = this;
return bootbox.confirm(
I18n.t("admin.emoji.delete_confirm", { name: emoji.get("name") }),
I18n.t("no_value"),
I18n.t("yes_value"),
- function(destroy) {
+ destroy => {
if (destroy) {
- return ajax("/admin/customize/emojis/" + emoji.get("name"), { type: "DELETE" }).then(function() {
- self.removeObject(emoji);
+ return ajax("/admin/customize/emojis/" + emoji.get("name"), { type: "DELETE" }).then(() => {
+ this.get('model').removeObject(emoji);
});
}
}
diff --git a/app/assets/javascripts/admin/controllers/admin-flags-list.js.es6 b/app/assets/javascripts/admin/controllers/admin-flags-list.js.es6
index 0c85749775a..e3101e2fa32 100644
--- a/app/assets/javascripts/admin/controllers/admin-flags-list.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-flags-list.js.es6
@@ -1,6 +1,6 @@
import FlaggedPost from 'admin/models/flagged-post';
-export default Ember.ArrayController.extend({
+export default Ember.Controller.extend({
query: null,
adminOldFlagsView: Em.computed.equal("query", "old"),
@@ -8,18 +8,16 @@ export default Ember.ArrayController.extend({
actions: {
disagreeFlags(flaggedPost) {
- var self = this;
- flaggedPost.disagreeFlags().then(function () {
- self.removeObject(flaggedPost);
+ flaggedPost.disagreeFlags().then(() => {
+ this.get('model').removeObject(flaggedPost);
}, function () {
bootbox.alert(I18n.t("admin.flags.error"));
});
},
deferFlags(flaggedPost) {
- var self = this;
- flaggedPost.deferFlags().then(function () {
- self.removeObject(flaggedPost);
+ flaggedPost.deferFlags().then(() => {
+ this.get('model').removeObject(flaggedPost);
}, function () {
bootbox.alert(I18n.t("admin.flags.error"));
});
@@ -29,7 +27,7 @@ export default Ember.ArrayController.extend({
this.send("disagreeFlags", item);
},
- loadMore(){
+ loadMore() {
const flags = this.get('model');
return FlaggedPost.findAll(this.get('query'), flags.length+1).then(data => {
if (data.length===0) {
diff --git a/app/assets/javascripts/admin/controllers/admin-group.js.es6 b/app/assets/javascripts/admin/controllers/admin-group.js.es6
index e477ba4b0a1..6c3da11d7f7 100644
--- a/app/assets/javascripts/admin/controllers/admin-group.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-group.js.es6
@@ -1,24 +1,11 @@
import { popupAjaxError } from 'discourse/lib/ajax-error';
-import { propertyEqual } from 'discourse/lib/computed';
+import computed from 'ember-addons/ember-computed-decorators';
export default Ember.Controller.extend({
- needs: ['adminGroupsType'],
+ adminGroupsType: Ember.inject.controller(),
disableSave: false,
savingStatus: '',
- currentPage: function() {
- if (this.get("model.user_count") === 0) { return 0; }
- return Math.floor(this.get("model.offset") / this.get("model.limit")) + 1;
- }.property("model.limit", "model.offset", "model.user_count"),
-
- totalPages: function() {
- if (this.get("model.user_count") === 0) { return 0; }
- return Math.floor(this.get("model.user_count") / this.get("model.limit")) + 1;
- }.property("model.limit", "model.user_count"),
-
- showingFirst: Em.computed.lte("currentPage", 1),
- showingLast: propertyEqual("currentPage", "totalPages"),
-
aliasLevelOptions: function() {
return [
{ name: I18n.t("groups.alias_levels.nobody"), value: 0 },
@@ -35,39 +22,17 @@ export default Ember.Controller.extend({
];
}.property(),
+ @computed('model.visible', 'model.public', 'model.alias_level')
+ disableMembershipRequestSetting(visible, publicGroup) {
+ return !visible || publicGroup || !this.get('model.canEveryoneMention');
+ },
+
+ @computed('model.visible', 'model.allow_membership_requests')
+ disablePublicSetting(visible, allowMembershipRequests) {
+ return !visible || allowMembershipRequests;
+ },
+
actions: {
- next() {
- if (this.get("showingLast")) { return; }
-
- const group = this.get("model"),
- offset = Math.min(group.get("offset") + group.get("limit"), group.get("user_count"));
-
- group.set("offset", offset);
-
- return group.findMembers();
- },
-
- previous() {
- if (this.get("showingFirst")) { return; }
-
- const group = this.get("model"),
- offset = Math.max(group.get("offset") - group.get("limit"), 0);
-
- group.set("offset", offset);
-
- return group.findMembers();
- },
-
- removeMember(member) {
- const self = this,
- message = I18n.t("admin.groups.delete_member_confirm", { username: member.get("username"), group: this.get("model.name") });
- return bootbox.confirm(message, I18n.t("no_value"), I18n.t("yes_value"), function(confirm) {
- if (confirm) {
- self.get("model").removeMember(member);
- }
- });
- },
-
removeOwner(member) {
const self = this,
message = I18n.t("admin.groups.delete_owner_confirm", { username: member.get("username"), group: this.get("model.name") });
@@ -84,21 +49,15 @@ export default Ember.Controller.extend({
this.set("model.ownerUsernames", null);
},
- addMembers() {
- if (Em.isEmpty(this.get("model.usernames"))) { return; }
- this.get("model").addMembers(this.get("model.usernames")).catch(popupAjaxError);
- this.set("model.usernames", null);
- },
-
save() {
const group = this.get('model'),
- groupsController = this.get("controllers.adminGroupsType"),
+ groupsController = this.get("adminGroupsType"),
groupType = groupsController.get("type");
this.set('disableSave', true);
this.set('savingStatus', I18n.t('saving'));
- let promise = group.get("id") ? group.save() : group.create().then(() => groupsController.addObject(group));
+ let promise = group.get("id") ? group.save() : group.create().then(() => groupsController.get('model').addObject(group));
promise.then(() => {
this.transitionToRoute("adminGroup", groupType, group.get('name'));
@@ -109,7 +68,7 @@ export default Ember.Controller.extend({
destroy() {
const group = this.get('model'),
- groupsController = this.get('controllers.adminGroupsType'),
+ groupsController = this.get('adminGroupsType'),
self = this;
if (!group.get('id')) {
diff --git a/app/assets/javascripts/admin/controllers/admin-groups-type.js.es6 b/app/assets/javascripts/admin/controllers/admin-groups-type.js.es6
index 9a5962cccfa..10d7ad01cfe 100644
--- a/app/assets/javascripts/admin/controllers/admin-groups-type.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-groups-type.js.es6
@@ -1,18 +1,18 @@
import { ajax } from 'discourse/lib/ajax';
-export default Ember.ArrayController.extend({
- sortProperties: ['name'],
+export default Ember.Controller.extend({
+ sortedGroups: Ember.computed.sort('model', 'groupSorting'),
+ groupSorting: ['name'],
+
refreshingAutoGroups: false,
- isAuto: function(){
- return this.get('type') === 'automatic';
- }.property('type'),
+
+ isAuto: Ember.computed.equal('type', 'automatic'),
actions: {
- refreshAutoGroups: function(){
- var self = this;
+ refreshAutoGroups() {
this.set('refreshingAutoGroups', true);
- ajax('/admin/groups/refresh_automatic_groups', {type: 'POST'}).then(function() {
- self.transitionToRoute("adminGroupsType", "automatic").then(function() {
- self.set('refreshingAutoGroups', false);
+ ajax('/admin/groups/refresh_automatic_groups', {type: 'POST'}).then(() => {
+ this.transitionToRoute("adminGroupsType", "automatic").then(() => {
+ this.set('refreshingAutoGroups', false);
});
});
}
diff --git a/app/assets/javascripts/admin/controllers/admin-logs-screened-emails.js.es6 b/app/assets/javascripts/admin/controllers/admin-logs-screened-emails.js.es6
index fe158a33aba..13685f16b95 100644
--- a/app/assets/javascripts/admin/controllers/admin-logs-screened-emails.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-logs-screened-emails.js.es6
@@ -2,12 +2,12 @@ import { exportEntity } from 'discourse/lib/export-csv';
import { outputExportResult } from 'discourse/lib/export-result';
import ScreenedEmail from 'admin/models/screened-email';
-export default Ember.ArrayController.extend({
+export default Ember.Controller.extend({
loading: false,
actions: {
clearBlock(row){
- row.clearBlock().then(function(){
+ row.clearBlock().then(function() {
// feeling lazy
window.location.reload();
});
@@ -19,11 +19,10 @@ export default Ember.ArrayController.extend({
},
show() {
- var self = this;
- self.set('loading', true);
- ScreenedEmail.findAll().then(function(result) {
- self.set('model', result);
- self.set('loading', false);
+ this.set('loading', true);
+ ScreenedEmail.findAll().then(result => {
+ this.set('model', result);
+ this.set('loading', false);
});
}
});
diff --git a/app/assets/javascripts/admin/controllers/admin-logs-screened-ip-addresses.js.es6 b/app/assets/javascripts/admin/controllers/admin-logs-screened-ip-addresses.js.es6
index 88f46d6ccbc..b654e6d65f7 100644
--- a/app/assets/javascripts/admin/controllers/admin-logs-screened-ip-addresses.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-logs-screened-ip-addresses.js.es6
@@ -3,7 +3,7 @@ import { outputExportResult } from 'discourse/lib/export-result';
import { exportEntity } from 'discourse/lib/export-csv';
import ScreenedIpAddress from 'admin/models/screened-ip-address';
-export default Ember.ArrayController.extend({
+export default Ember.Controller.extend({
loading: false,
filter: null,
savedIpAddress: null,
@@ -63,16 +63,15 @@ export default Ember.ArrayController.extend({
},
destroy(record) {
- const self = this;
return bootbox.confirm(
I18n.t("admin.logs.screened_ips.delete_confirm", { ip_address: record.get('ip_address') }),
I18n.t("no_value"),
I18n.t("yes_value"),
- function (result) {
+ result => {
if (result) {
record.destroy().then(deleted => {
if (deleted) {
- self.get("content").removeObject(record);
+ this.get("model").removeObject(record);
} else {
bootbox.alert(I18n.t("generic_error"));
}
diff --git a/app/assets/javascripts/admin/controllers/admin-logs-screened-urls.js.es6 b/app/assets/javascripts/admin/controllers/admin-logs-screened-urls.js.es6
index 5f5e3339608..d57a151d219 100644
--- a/app/assets/javascripts/admin/controllers/admin-logs-screened-urls.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-logs-screened-urls.js.es6
@@ -2,15 +2,14 @@ import { exportEntity } from 'discourse/lib/export-csv';
import { outputExportResult } from 'discourse/lib/export-result';
import ScreenedUrl from 'admin/models/screened-url';
-export default Ember.ArrayController.extend({
+export default Ember.Controller.extend({
loading: false,
show() {
- const self = this;
- self.set('loading', true);
- ScreenedUrl.findAll().then(function(result) {
- self.set('model', result);
- self.set('loading', false);
+ this.set('loading', true);
+ ScreenedUrl.findAll().then(result => {
+ this.set('model', result);
+ this.set('loading', false);
});
},
diff --git a/app/assets/javascripts/admin/controllers/admin-logs-staff-action-logs.js.es6 b/app/assets/javascripts/admin/controllers/admin-logs-staff-action-logs.js.es6
index 956a737e578..98f135dc57c 100644
--- a/app/assets/javascripts/admin/controllers/admin-logs-staff-action-logs.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-logs-staff-action-logs.js.es6
@@ -2,7 +2,7 @@ import { exportEntity } from 'discourse/lib/export-csv';
import { outputExportResult } from 'discourse/lib/export-result';
import StaffActionLog from 'admin/models/staff-action-log';
-export default Ember.ArrayController.extend({
+export default Ember.Controller.extend({
loading: false,
filters: null,
diff --git a/app/assets/javascripts/admin/controllers/admin-permalinks.js.es6 b/app/assets/javascripts/admin/controllers/admin-permalinks.js.es6
index 9c5ab4bb3e8..6bfcc669227 100644
--- a/app/assets/javascripts/admin/controllers/admin-permalinks.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-permalinks.js.es6
@@ -1,16 +1,14 @@
import debounce from 'discourse/lib/debounce';
import Permalink from 'admin/models/permalink';
-export default Ember.ArrayController.extend({
+export default Ember.Controller.extend({
loading: false,
filter: null,
show: debounce(function() {
- var self = this;
- self.set('loading', true);
- Permalink.findAll(self.get("filter")).then(function(result) {
- self.set('model', result);
- self.set('loading', false);
+ Permalink.findAll(this.get("filter")).then(result => {
+ this.set('model', result);
+ this.set('loading', false);
});
}, 250).observes("filter"),
@@ -20,12 +18,11 @@ export default Ember.ArrayController.extend({
},
destroy: function(record) {
- const self = this;
- return bootbox.confirm(I18n.t("admin.permalink.delete_confirm"), I18n.t("no_value"), I18n.t("yes_value"), function(result) {
+ return bootbox.confirm(I18n.t("admin.permalink.delete_confirm"), I18n.t("no_value"), I18n.t("yes_value"), result => {
if (result) {
- record.destroy().then(function(deleted) {
+ record.destroy().then(deleted => {
if (deleted) {
- self.removeObject(record);
+ this.get('model').removeObject(record);
} else {
bootbox.alert(I18n.t("generic_error"));
}
diff --git a/app/assets/javascripts/admin/controllers/admin-plugins.js.es6 b/app/assets/javascripts/admin/controllers/admin-plugins.js.es6
index b2eb1335ed8..5393a27c8f6 100644
--- a/app/assets/javascripts/admin/controllers/admin-plugins.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-plugins.js.es6
@@ -1,10 +1,9 @@
-export default Ember.ArrayController.extend({
-
+export default Ember.Controller.extend({
adminRoutes: function() {
- return this.get('model').map(function(p) {
- if (p.get('enabled')) {
- return p.admin_route;
- }
+ return this.get('model').map(p => {
+ if (p.get('enabled')) {
+ return p.admin_route;
+ }
}).compact();
}.property()
});
diff --git a/app/assets/javascripts/admin/controllers/admin-site-settings-category.js.es6 b/app/assets/javascripts/admin/controllers/admin-site-settings-category.js.es6
index b16db34e3e6..df0738bed18 100644
--- a/app/assets/javascripts/admin/controllers/admin-site-settings-category.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-site-settings-category.js.es6
@@ -1,16 +1,16 @@
export default Ember.Controller.extend({
categoryNameKey: null,
- needs: ['adminSiteSettings'],
+ adminSiteSettings: Ember.inject.controller(),
filteredContent: function() {
if (!this.get('categoryNameKey')) { return []; }
- const category = this.get('controllers.adminSiteSettings.content').findProperty('nameKey', this.get('categoryNameKey'));
+ const category = (this.get('adminSiteSettings.model') || []).findBy('nameKey', this.get('categoryNameKey'));
if (category) {
return category.siteSettings;
} else {
return [];
}
- }.property('controllers.adminSiteSettings.content', 'categoryNameKey')
+ }.property('adminSiteSettings.model', 'categoryNameKey')
});
diff --git a/app/assets/javascripts/admin/controllers/admin-site-settings.js.es6 b/app/assets/javascripts/admin/controllers/admin-site-settings.js.es6
index b7c4302e87c..9cd65adf101 100644
--- a/app/assets/javascripts/admin/controllers/admin-site-settings.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-site-settings.js.es6
@@ -1,6 +1,7 @@
import debounce from 'discourse/lib/debounce';
-export default Ember.ArrayController.extend({
+export default Ember.Controller.extend({
+ queryParams: ["filter"],
filter: null,
onlyOverridden: false,
filtered: Ember.computed.notEmpty('filter'),
diff --git a/app/assets/javascripts/admin/controllers/admin-site-text-index.js.es6 b/app/assets/javascripts/admin/controllers/admin-site-text-index.js.es6
index 0c770bd06bd..bc2147e9232 100644
--- a/app/assets/javascripts/admin/controllers/admin-site-text-index.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-site-text-index.js.es6
@@ -1,38 +1,14 @@
-import { default as computed } from 'ember-addons/ember-computed-decorators';
-
let lastSearch;
+let lastOverridden;
export default Ember.Controller.extend({
- _q: null,
searching: false,
siteTexts: null,
preferred: false,
- _overridden: null,
queryParams: ['q', 'overridden'],
- @computed
- overridden: {
- set(value) {
- if (!value || value === "false") { value = false; }
- this._overridden = value;
- return value;
- },
- get() {
- return this._overridden;
- }
- },
-
- @computed
- q: {
- set(value) {
- if (Ember.isEmpty(value)) { value = null; }
- this._q = value;
- return value;
- },
- get() {
- return this._q;
- }
- },
+ q: null,
+ overridden: null,
_performSearch() {
this.store.find('site-text', this.getProperties('q', 'overridden')).then(results => {
@@ -46,11 +22,14 @@ export default Ember.Controller.extend({
},
search(overridden) {
+ this.set('overridden', overridden);
+
const q = this.get('q');
- if (q !== lastSearch || overridden) {
+ if (q !== lastSearch || overridden !== lastOverridden) {
this.set('searching', true);
Ember.run.debounce(this, this._performSearch, 400);
lastSearch = q;
+ lastOverridden = overridden;
}
}
}
diff --git a/app/assets/javascripts/admin/controllers/admin-user-badges.js.es6 b/app/assets/javascripts/admin/controllers/admin-user-badges.js.es6
index c8c0ba6219e..a2b7c94f175 100644
--- a/app/assets/javascripts/admin/controllers/admin-user-badges.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-user-badges.js.es6
@@ -1,10 +1,11 @@
import UserBadge from 'discourse/models/user-badge';
-export default Ember.ArrayController.extend({
- needs: ["adminUser"],
- user: Em.computed.alias('controllers.adminUser.model'),
- sortProperties: ['granted_at'],
- sortAscending: false,
+export default Ember.Controller.extend({
+ adminUser: Ember.inject.controller(),
+ user: Ember.computed.alias('adminUser.model'),
+
+ sortedBadges: Ember.computed.sort('model', 'badgeSortOrder'),
+ badgeSortOrder: ['granted_at:desc'],
groupedBadges: function(){
const allBadges = this.get('model');
@@ -38,8 +39,6 @@ export default Ember.ArrayController.extend({
});
return _(expanded).sortBy(group => group.granted_at).reverse().value();
-
-
}.property('model', 'model.[]', 'model.expandedBadges.[]'),
/**
@@ -80,22 +79,15 @@ export default Ember.ArrayController.extend({
model.get('expandedBadges').pushObject(userBadge.badge.id);
},
- /**
- Grant the selected badge to the user.
-
- @method grantBadge
- @param {Integer} badgeId id of the badge we want to grant.
- **/
- grantBadge: function(badgeId) {
- var self = this;
- UserBadge.grant(badgeId, this.get('user.username'), this.get('badgeReason')).then(function(userBadge) {
- self.set('badgeReason', '');
- self.pushObject(userBadge);
- Ember.run.next(function() {
+ grantBadge(badgeId) {
+ UserBadge.grant(badgeId, this.get('user.username'), this.get('badgeReason')).then(userBadge => {
+ this.set('badgeReason', '');
+ this.get('model').pushObject(userBadge);
+ Ember.run.next(() => {
// Update the selected badge ID after the combobox has re-rendered.
- var newSelectedBadge = self.get('grantableBadges')[0];
+ const newSelectedBadge = this.get('grantableBadges')[0];
if (newSelectedBadge) {
- self.set('selectedBadgeId', newSelectedBadge.get('id'));
+ this.set('selectedBadgeId', newSelectedBadge.get('id'));
}
});
}, function() {
@@ -104,12 +96,11 @@ export default Ember.ArrayController.extend({
});
},
- revokeBadge: function(userBadge) {
- var self = this;
- return bootbox.confirm(I18n.t("admin.badges.revoke_confirm"), I18n.t("no_value"), I18n.t("yes_value"), function(result) {
+ revokeBadge(userBadge) {
+ return bootbox.confirm(I18n.t("admin.badges.revoke_confirm"), I18n.t("no_value"), I18n.t("yes_value"), result => {
if (result) {
- userBadge.revoke().then(function() {
- self.get('model').removeObject(userBadge);
+ userBadge.revoke().then(() => {
+ this.get('model').removeObject(userBadge);
});
}
});
diff --git a/app/assets/javascripts/admin/controllers/admin-user-fields.js.es6 b/app/assets/javascripts/admin/controllers/admin-user-fields.js.es6
index 70963a147e5..6b106b075d8 100644
--- a/app/assets/javascripts/admin/controllers/admin-user-fields.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-user-fields.js.es6
@@ -6,12 +6,8 @@ export default Ember.Controller.extend({
fieldTypes: null,
createDisabled: Em.computed.gte('model.length', MAX_FIELDS),
- arrangedContent: function() {
- return Ember.ArrayProxy.extend(Ember.SortableMixin).create({
- sortProperties: ['position'],
- content: this.get('model')
- });
- }.property('model'),
+ fieldSortOrder: ['position'],
+ sortedFields: Ember.computed.sort('model', 'fieldSortOrder'),
actions: {
createField() {
@@ -20,9 +16,9 @@ export default Ember.Controller.extend({
},
moveUp(f) {
- const idx = this.get('arrangedContent').indexOf(f);
+ const idx = this.get('sortedFields').indexOf(f);
if (idx) {
- const prev = this.get('arrangedContent').objectAt(idx-1);
+ const prev = this.get('sortedFields').objectAt(idx-1);
const prevPos = prev.get('position');
prev.update({ position: f.get('position') });
@@ -31,9 +27,9 @@ export default Ember.Controller.extend({
},
moveDown(f) {
- const idx = this.get('arrangedContent').indexOf(f);
+ const idx = this.get('sortedFields').indexOf(f);
if (idx > -1) {
- const next = this.get('arrangedContent').objectAt(idx+1);
+ const next = this.get('sortedFields').objectAt(idx+1);
const nextPos = next.get('position');
next.update({ position: f.get('position') });
diff --git a/app/assets/javascripts/admin/controllers/admin-user-index.js.es6 b/app/assets/javascripts/admin/controllers/admin-user-index.js.es6
index 0c1cb7abb37..14bc031c0a3 100644
--- a/app/assets/javascripts/admin/controllers/admin-user-index.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-user-index.js.es6
@@ -31,6 +31,29 @@ export default Ember.Controller.extend(CanCheckEmails, {
}.property('model.user_fields.[]'),
actions: {
+
+ impersonate() { return this.get("model").impersonate(); },
+ logOut() { return this.get("model").logOut(); },
+ resetBounceScore() { return this.get("model").resetBounceScore(); },
+ refreshBrowsers() { return this.get("model").refreshBrowsers(); },
+ approve() { return this.get("model").approve(); },
+ deactivate() { return this.get("model").deactivate(); },
+ sendActivationEmail() { return this.get("model").sendActivationEmail(); },
+ activate() { return this.get("model").activate(); },
+ revokeAdmin() { return this.get("model").revokeAdmin(); },
+ grantAdmin() { return this.get("model").grantAdmin(); },
+ revokeModeration() { return this.get("model").revokeModeration(); },
+ grantModeration() { return this.get("model").grantModeration(); },
+ saveTrustLevel() { return this.get("model").saveTrustLevel(); },
+ restoreTrustLevel() { return this.get("model").restoreTrustLevel(); },
+ lockTrustLevel(locked) { return this.get("model").lockTrustLevel(locked); },
+ unsuspend() { return this.get("model").unsuspend(); },
+ unblock() { return this.get("model").unblock(); },
+ block() { return this.get("model").block(); },
+ deleteAllPosts() { return this.get("model").deleteAllPosts(); },
+ anonymize() { return this.get('model').anonymize(); },
+ destroy() { return this.get('model').destroy(); },
+
toggleTitleEdit() {
this.set('userTitleValue', this.get('model.title'));
this.toggleProperty('editingTitle');
@@ -39,7 +62,7 @@ export default Ember.Controller.extend(CanCheckEmails, {
saveTitle() {
const self = this;
- return ajax("/users/" + this.get('model.username').toLowerCase(), {
+ return ajax(`/users/${this.get('model.username').toLowerCase()}.json`, {
data: {title: this.get('userTitleValue')},
type: 'PUT'
}).catch(function(e) {
@@ -107,14 +130,6 @@ export default Ember.Controller.extend(CanCheckEmails, {
if (result) { self.get('model').revokeApiKey(); }
}
);
- },
-
- anonymize() {
- this.get('model').anonymize();
- },
-
- destroy() {
- this.get('model').destroy();
}
}
diff --git a/app/assets/javascripts/admin/controllers/admin-users-list-show.js.es6 b/app/assets/javascripts/admin/controllers/admin-users-list-show.js.es6
index af4a0297ef6..1d877dadaf5 100644
--- a/app/assets/javascripts/admin/controllers/admin-users-list-show.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-users-list-show.js.es6
@@ -2,7 +2,7 @@ import debounce from 'discourse/lib/debounce';
import { i18n } from 'discourse/lib/computed';
import AdminUser from 'admin/models/admin-user';
-export default Ember.ArrayController.extend({
+export default Ember.Controller.extend({
query: null,
showEmails: false,
refreshing: false,
@@ -19,7 +19,7 @@ export default Ember.ArrayController.extend({
selectedCount: function() {
var model = this.get('model');
if (!model || !model.length) return 0;
- return model.filterProperty('selected').length;
+ return model.filterBy('selected').length;
}.property('model.@each.selected'),
selectAllChanged: function() {
@@ -52,14 +52,14 @@ export default Ember.ArrayController.extend({
actions: {
approveUsers: function() {
- AdminUser.bulkApprove(this.get('model').filterProperty('selected'));
+ AdminUser.bulkApprove(this.get('model').filterBy('selected'));
this._refreshUsers();
},
rejectUsers: function() {
var maxPostAge = this.siteSettings.delete_user_max_post_age;
var controller = this;
- AdminUser.bulkReject(this.get('model').filterProperty('selected')).then(function(result){
+ AdminUser.bulkReject(this.get('model').filterBy('selected')).then(function(result){
var message = I18n.t("admin.users.reject_successful", {count: result.success});
if (result.failed > 0) {
message += ' ' + I18n.t("admin.users.reject_failures", {count: result.failed});
diff --git a/app/assets/javascripts/admin/controllers/admin-web-hooks-show-events.js.es6 b/app/assets/javascripts/admin/controllers/admin-web-hooks-show-events.js.es6
new file mode 100644
index 00000000000..6ef4411702e
--- /dev/null
+++ b/app/assets/javascripts/admin/controllers/admin-web-hooks-show-events.js.es6
@@ -0,0 +1,65 @@
+import { ajax } from 'discourse/lib/ajax';
+import { popupAjaxError } from 'discourse/lib/ajax-error';
+import computed from 'ember-addons/ember-computed-decorators';
+
+export default Ember.Controller.extend({
+ pingDisabled: false,
+ incomingEventIds: [],
+ incomingCount: Ember.computed.alias("incomingEventIds.length"),
+
+ @computed('incomingCount')
+ hasIncoming(incomingCount) {
+ return incomingCount > 0;
+ },
+
+ subscribe() {
+ this.messageBus.subscribe(`/web_hook_events/${this.get('model.extras.web_hook_id')}`, data => {
+ if (data.event_type === 'ping') {
+ this.set('pingDisabled', false);
+ }
+ this._addIncoming(data.web_hook_event_id);
+ });
+ },
+
+ unsubscribe() {
+ this.messageBus.unsubscribe('/web_hook_events/*');
+ },
+
+ _addIncoming(eventId) {
+ const incomingEventIds = this.get("incomingEventIds");
+
+ if (incomingEventIds.indexOf(eventId) === -1) {
+ incomingEventIds.pushObject(eventId);
+ }
+ },
+
+ actions: {
+ loadMore() {
+ this.get('model').loadMore();
+ },
+
+ ping() {
+ this.set('pingDisabled', true);
+
+ ajax(`/admin/api/web_hooks/${this.get('model.extras.web_hook_id')}/ping`, {
+ type: 'POST'
+ }).catch(error => {
+ this.set('pingDisabled', false);
+ popupAjaxError(error);
+ });
+ },
+
+ showInserted() {
+ const webHookId = this.get('model.extras.web_hook_id');
+
+ ajax(`/admin/api/web_hooks/${webHookId}/events/bulk`, {
+ type: 'GET',
+ data: { ids: this.get('incomingEventIds') }
+ }).then(data => {
+ const objects = data.map(event => this.store.createRecord('web-hook-event', event));
+ this.get("model").unshiftObjects(objects);
+ this.set("incomingEventIds", []);
+ });
+ }
+ }
+});
diff --git a/app/assets/javascripts/admin/controllers/admin-web-hooks-show.js.es6 b/app/assets/javascripts/admin/controllers/admin-web-hooks-show.js.es6
new file mode 100644
index 00000000000..53d8370403b
--- /dev/null
+++ b/app/assets/javascripts/admin/controllers/admin-web-hooks-show.js.es6
@@ -0,0 +1,98 @@
+import { popupAjaxError } from 'discourse/lib/ajax-error';
+import { extractDomainFromUrl } from 'discourse/lib/utilities';
+import computed from 'ember-addons/ember-computed-decorators';
+import InputValidation from 'discourse/models/input-validation';
+
+export default Ember.Controller.extend({
+ adminWebHooks: Ember.inject.controller(),
+ eventTypes: Ember.computed.alias('adminWebHooks.eventTypes'),
+ defaultEventTypes: Ember.computed.alias('adminWebHooks.defaultEventTypes'),
+ contentTypes: Ember.computed.alias('adminWebHooks.contentTypes'),
+
+ @computed('model.isSaving', 'saved', 'saveButtonDisabled')
+ savingStatus(isSaving, saved, saveButtonDisabled) {
+ if (isSaving) {
+ return I18n.t('saving');
+ } else if (!saveButtonDisabled && saved) {
+ return I18n.t('saved');
+ }
+ // Use side effect of validation to clear saved text
+ this.set('saved', false);
+ return '';
+ },
+
+ @computed('model.isNew')
+ saveButtonText(isNew) {
+ return isNew ? I18n.t('admin.web_hooks.create') : I18n.t('admin.web_hooks.save');
+ },
+
+ @computed('model.secret')
+ secretValidation(secret) {
+ if (!Ember.isEmpty(secret)) {
+ if (secret.indexOf(' ') !== -1) {
+ return InputValidation.create({
+ failed: true,
+ reason: I18n.t('admin.web_hooks.secret_invalid')
+ });
+ }
+
+ if (secret.length < 12) {
+ return InputValidation.create({
+ failed: true,
+ reason: I18n.t('admin.web_hooks.secret_too_short')
+ });
+ }
+ }
+ },
+
+ @computed('model.wildcard_web_hook', 'model.web_hook_event_types.[]')
+ eventTypeValidation(isWildcard, eventTypes) {
+ if (!isWildcard && Ember.isEmpty(eventTypes)) {
+ return InputValidation.create({
+ failed: true,
+ reason: I18n.t('admin.web_hooks.event_type_missing')
+ });
+ }
+ },
+
+ @computed('model.isSaving', 'secretValidation', 'eventTypeValidation')
+ saveButtonDisabled(isSaving, secretValidation, eventTypeValidation) {
+ return isSaving ? false : secretValidation || eventTypeValidation;
+ },
+
+ actions: {
+ save() {
+ this.set('saved', false);
+ const url = extractDomainFromUrl(this.get('model.payload_url'));
+ const model = this.get('model');
+ const saveWebHook = () => {
+ return model.save().then(() => {
+ this.set('saved', true);
+ this.get('adminWebHooks').get('model').addObject(model);
+ }).catch(popupAjaxError);
+ };
+
+ if (url === 'localhost' || url.match(/192\.168\.\d+\.\d+/) || url.match(/127\.\d+\.\d+\.\d+/) || url === Discourse.BaseUrl) {
+ return bootbox.confirm(I18n.t('admin.web_hooks.warn_local_payload_url'), I18n.t('no_value'), I18n.t('yes_value'), result => {
+ if (result) {
+ return saveWebHook();
+ }
+ });
+ }
+
+ return saveWebHook();
+ },
+
+ destroy() {
+ return bootbox.confirm(I18n.t('admin.web_hooks.delete_confirm'), I18n.t('no_value'), I18n.t('yes_value'), result => {
+ if (result) {
+ const model = this.get('model');
+ model.destroyRecord().then(() => {
+ this.get('adminWebHooks').get('model').removeObject(model);
+ this.transitionToRoute('adminWebHooks');
+ }).catch(popupAjaxError);
+ }
+ });
+ }
+ }
+});
diff --git a/app/assets/javascripts/admin/controllers/admin-web-hooks.js.es6 b/app/assets/javascripts/admin/controllers/admin-web-hooks.js.es6
new file mode 100644
index 00000000000..50b8b370f3a
--- /dev/null
+++ b/app/assets/javascripts/admin/controllers/admin-web-hooks.js.es6
@@ -0,0 +1,19 @@
+import { popupAjaxError } from 'discourse/lib/ajax-error';
+
+export default Ember.Controller.extend({
+ actions: {
+ destroy(webhook) {
+ return bootbox.confirm(I18n.t('admin.web_hooks.delete_confirm'), I18n.t('no_value'), I18n.t('yes_value'), result => {
+ if (result) {
+ webhook.destroyRecord().then(() => {
+ this.get('model').removeObject(webhook);
+ }).catch(popupAjaxError);
+ }
+ });
+ },
+
+ loadMore() {
+ this.get('model').loadMore();
+ }
+ }
+});
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-agree-flag.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-agree-flag.js.es6
index 2924eb66998..7f1f4f2e49a 100644
--- a/app/assets/javascripts/admin/controllers/modals/admin-agree-flag.js.es6
+++ b/app/assets/javascripts/admin/controllers/modals/admin-agree-flag.js.es6
@@ -1,16 +1,15 @@
import ModalFunctionality from 'discourse/mixins/modal-functionality';
export default Ember.Controller.extend(ModalFunctionality, {
- needs: ["admin-flags-list"],
+ adminFlagsList: Ember.inject.controller(),
_agreeFlag: function (actionOnPost) {
- var adminFlagController = this.get("controllers.admin-flags-list");
- var post = this.get("content");
- var self = this;
+ const adminFlagController = this.get("adminFlagsList");
+ const post = this.get("content");
- return post.agreeFlags(actionOnPost).then(function () {
- adminFlagController.removeObject(post);
- self.send("closeModal");
+ return post.agreeFlags(actionOnPost).then(() => {
+ adminFlagController.get('model').removeObject(post);
+ this.send("closeModal");
}, function () {
bootbox.alert(I18n.t("admin.flags.error"));
});
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-badge-preview.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-badge-preview.js.es6
index 8f93884c604..8aaf637552e 100644
--- a/app/assets/javascripts/admin/controllers/modals/admin-badge-preview.js.es6
+++ b/app/assets/javascripts/admin/controllers/modals/admin-badge-preview.js.es6
@@ -1,11 +1,9 @@
import { escapeExpression } from 'discourse/lib/utilities';
export default Ember.Controller.extend({
- needs: ['modal'],
-
- sample: Em.computed.alias('model.sample'),
- errors: Em.computed.alias('model.errors'),
- count: Em.computed.alias('model.grant_count'),
+ sample: Ember.computed.alias('model.sample'),
+ errors: Ember.computed.alias('model.errors'),
+ count: Ember.computed.alias('model.grant_count'),
count_warning: function() {
if (this.get('count') <= 10) {
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-delete-flag.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-delete-flag.js.es6
index 284b8bfd09d..fc2e0627946 100644
--- a/app/assets/javascripts/admin/controllers/modals/admin-delete-flag.js.es6
+++ b/app/assets/javascripts/admin/controllers/modals/admin-delete-flag.js.es6
@@ -1,36 +1,31 @@
import ModalFunctionality from 'discourse/mixins/modal-functionality';
export default Ember.Controller.extend(ModalFunctionality, {
- needs: ["admin-flags-list"],
+ adminFlagsList: Ember.inject.controller(),
actions: {
+ deletePostDeferFlag() {
+ const adminFlagController = this.get("adminFlagsList");
+ const post = this.get("content");
- deletePostDeferFlag: function () {
- var adminFlagController = this.get("controllers.admin-flags-list");
- var post = this.get("content");
- var self = this;
-
- return post.deferFlags(true).then(function () {
- adminFlagController.removeObject(post);
- self.send("closeModal");
+ return post.deferFlags(true).then(() => {
+ adminFlagController.get('model').removeObject(post);
+ this.send("closeModal");
}, function () {
bootbox.alert(I18n.t("admin.flags.error"));
});
},
- deletePostAgreeFlag: function () {
- var adminFlagController = this.get("controllers.admin-flags-list");
- var post = this.get("content");
- var self = this;
+ deletePostAgreeFlag() {
+ const adminFlagController = this.get("adminFlagsList");
+ const post = this.get("content");
- return post.agreeFlags("delete").then(function () {
- adminFlagController.removeObject(post);
- self.send("closeModal");
+ return post.agreeFlags("delete").then(() => {
+ adminFlagController.get('model').removeObject(post);
+ this.send("closeModal");
}, function () {
bootbox.alert(I18n.t("admin.flags.error"));
});
}
-
}
-
});
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-edit-badge-groupings.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-edit-badge-groupings.js.es6
index 086080c1738..fe0416bc307 100644
--- a/app/assets/javascripts/admin/controllers/modals/admin-edit-badge-groupings.js.es6
+++ b/app/assets/javascripts/admin/controllers/modals/admin-edit-badge-groupings.js.es6
@@ -1,6 +1,5 @@
import { ajax } from 'discourse/lib/ajax';
export default Ember.Controller.extend({
- needs: ['modal'],
modelChanged: function(){
const model = this.get('model');
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-start-backup.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-start-backup.js.es6
index 15cd838245b..c041b24f744 100644
--- a/app/assets/javascripts/admin/controllers/modals/admin-start-backup.js.es6
+++ b/app/assets/javascripts/admin/controllers/modals/admin-start-backup.js.es6
@@ -2,31 +2,27 @@ import ModalFunctionality from 'discourse/mixins/modal-functionality';
import Backup from 'admin/models/backup';
export default Ember.Controller.extend(ModalFunctionality, {
- needs: ["adminBackupsLogs"],
+ adminBackupsLogs: Ember.inject.controller(),
- _startBackup: function (withUploads) {
- var self = this;
- Discourse.User.currentProp("hideReadOnlyAlert", true);
- Backup.start(withUploads).then(function() {
- self.get("controllers.adminBackupsLogs").clear();
- self.send("backupStarted");
+ _startBackup(withUploads) {
+ this.currentUser.set('hideReadOnlyAlert', true);
+ Backup.start(withUploads).then(() => {
+ this.get("adminBackupsLogs.logs").clear();
+ this.send("backupStarted");
});
},
actions: {
-
- startBackup: function () {
+ startBackup() {
this._startBackup();
},
- startBackupWithoutUpload: function () {
+ startBackupWithoutUpload() {
this._startBackup(false);
},
- cancel: function () {
+ cancel() {
this.send("closeModal");
}
-
}
-
});
diff --git a/app/assets/javascripts/admin/controllers/modals/delete-site-customization-details.js.es6 b/app/assets/javascripts/admin/controllers/modals/delete-site-customization-details.js.es6
index d38c396ceb7..95537e305a3 100644
--- a/app/assets/javascripts/admin/controllers/modals/delete-site-customization-details.js.es6
+++ b/app/assets/javascripts/admin/controllers/modals/delete-site-customization-details.js.es6
@@ -1,7 +1,7 @@
import ChangeSiteCustomizationDetailsController from "admin/controllers/modals/change-site-customization-details";
export default ChangeSiteCustomizationDetailsController.extend({
- onShow: function() {
+ onShow() {
this.send("selectPrevious");
}
});
diff --git a/app/assets/javascripts/admin/helpers/human-size.js.es6 b/app/assets/javascripts/admin/helpers/human-size.js.es6
index a43897c627e..a50cfe58190 100644
--- a/app/assets/javascripts/admin/helpers/human-size.js.es6
+++ b/app/assets/javascripts/admin/helpers/human-size.js.es6
@@ -1,3 +1,3 @@
-import { htmlHelper } from 'discourse/lib/helpers';
+import { htmlHelper } from 'discourse-common/lib/helpers';
export default htmlHelper(size => I18n.toHumanSize(size));
diff --git a/app/assets/javascripts/admin/helpers/preserve-newlines.js.es6 b/app/assets/javascripts/admin/helpers/preserve-newlines.js.es6
index 73bac433799..b58e9a552ce 100644
--- a/app/assets/javascripts/admin/helpers/preserve-newlines.js.es6
+++ b/app/assets/javascripts/admin/helpers/preserve-newlines.js.es6
@@ -1,4 +1,4 @@
-import { htmlHelper } from 'discourse/lib/helpers';
+import { htmlHelper } from 'discourse-common/lib/helpers';
import { escapeExpression } from 'discourse/lib/utilities';
export default htmlHelper(str => escapeExpression(str).replace(/\n/g, "
"));
diff --git a/app/assets/javascripts/admin/helpers/value-at-tl.js.es6 b/app/assets/javascripts/admin/helpers/value-at-tl.js.es6
index aeac49e83d6..48d2271caba 100644
--- a/app/assets/javascripts/admin/helpers/value-at-tl.js.es6
+++ b/app/assets/javascripts/admin/helpers/value-at-tl.js.es6
@@ -1,4 +1,4 @@
-import { registerUnbound } from 'discourse/lib/helpers';
+import { registerUnbound } from 'discourse-common/lib/helpers';
registerUnbound('value-at-tl', function(data, params) {
var tl = parseInt(params.level, 10);
diff --git a/app/assets/javascripts/admin/models/admin-user.js.es6 b/app/assets/javascripts/admin/models/admin-user.js.es6
index d804894770a..48764b671d6 100644
--- a/app/assets/javascripts/admin/models/admin-user.js.es6
+++ b/app/assets/javascripts/admin/models/admin-user.js.es6
@@ -96,7 +96,7 @@ const AdminUser = Discourse.User.extend({
deleteAllPosts() {
const user = this,
- message = I18n.t('admin.user.delete_all_posts_confirm', { posts: user.get('post_count'), topics: user.get('topic_count') }),
+ message = I18n.messageFormat('admin.user.delete_all_posts_confirm_MF', { "POSTS": user.get('post_count'), "TOPICS": user.get('topic_count') }),
buttons = [{
"label": I18n.t("composer.cancel"),
"class": "cancel-inline",
@@ -257,7 +257,7 @@ const AdminUser = Discourse.User.extend({
});
},
- log_out() {
+ logOut() {
return ajax("/admin/users/" + this.id + "/log_out", {
type: 'POST',
data: { username_or_email: this.get('username') }
@@ -467,13 +467,13 @@ const AdminUser = Discourse.User.extend({
user.checkEmail().then(function() {
const data = {
- posts: user.get('post_count'),
- topics: user.get('topic_count'),
+ "POSTS": user.get('post_count'),
+ "TOPICS": user.get('topic_count'),
email: user.get('email') || I18n.t("flagging.hidden_email_address"),
ip_address: user.get('ip_address') || I18n.t("flagging.ip_address_missing")
};
- const message = I18n.t('flagging.delete_confirm', data),
+ const message = I18n.messageFormat('flagging.delete_confirm_MF', data),
buttons = [{
"label": I18n.t("composer.cancel"),
"class": "cancel-inline",
diff --git a/app/assets/javascripts/admin/models/api-key.js.es6 b/app/assets/javascripts/admin/models/api-key.js.es6
index aa05ce8341c..2a7cf867783 100644
--- a/app/assets/javascripts/admin/models/api-key.js.es6
+++ b/app/assets/javascripts/admin/models/api-key.js.es6
@@ -52,7 +52,7 @@ ApiKey.reopenClass({
@returns {Promise} a promise that resolves to the array of `ApiKey` instances
**/
find: function() {
- return ajax("/admin/api").then(function(keys) {
+ return ajax("/admin/api/keys").then(function(keys) {
return keys.map(function (key) {
return ApiKey.create(key);
});
diff --git a/app/assets/javascripts/admin/models/backup.js.es6 b/app/assets/javascripts/admin/models/backup.js.es6
index d7baceebacf..7fe81441c37 100644
--- a/app/assets/javascripts/admin/models/backup.js.es6
+++ b/app/assets/javascripts/admin/models/backup.js.es6
@@ -2,7 +2,6 @@ import { ajax } from 'discourse/lib/ajax';
import PreloadStore from 'preload-store';
const Backup = Discourse.Model.extend({
-
destroy() {
return ajax("/admin/backups/" + this.get("filename"), { type: "DELETE" });
},
@@ -13,11 +12,9 @@ const Backup = Discourse.Model.extend({
data: { client_id: window.MessageBus.clientId }
});
}
-
});
Backup.reopenClass({
-
find() {
return PreloadStore.getAndRemove("backups", () => ajax("/admin/backups.json"))
.then(backups => backups.map(backup => Backup.create(backup)));
diff --git a/app/assets/javascripts/admin/models/email-preview.js.es6 b/app/assets/javascripts/admin/models/email-preview.js.es6
index f992bf250d8..acc7462b925 100644
--- a/app/assets/javascripts/admin/models/email-preview.js.es6
+++ b/app/assets/javascripts/admin/models/email-preview.js.es6
@@ -5,7 +5,7 @@ EmailPreview.reopenClass({
findDigest: function(lastSeenAt, username) {
if (Em.isEmpty(lastSeenAt)) {
- lastSeenAt = moment().subtract(7, 'days').format('YYYY-MM-DD');
+ lastSeenAt = this.oneWeekAgo();
}
if (Em.isEmpty(username)) {
@@ -17,6 +17,25 @@ EmailPreview.reopenClass({
}).then(function (result) {
return EmailPreview.create(result);
});
+ },
+
+ sendDigest: function(lastSeenAt, username, email) {
+ if (Em.isEmpty(lastSeenAt)) {
+ lastSeenAt = this.oneWeekAgo();
+ }
+
+ if (Em.isEmpty(username)) {
+ username = Discourse.User.current().username;
+ }
+
+ return ajax("/admin/email/send-digest.json", {
+ data: { last_seen_at: lastSeenAt, username: username, email: email }
+ });
+ },
+
+ oneWeekAgo() {
+ const en = moment().locale('en');
+ return en.subtract(7, 'days').format('YYYY-MM-DD');
}
});
diff --git a/app/assets/javascripts/admin/models/report.js.es6 b/app/assets/javascripts/admin/models/report.js.es6
index 3342323b467..03e3888f97b 100644
--- a/app/assets/javascripts/admin/models/report.js.es6
+++ b/app/assets/javascripts/admin/models/report.js.es6
@@ -81,7 +81,8 @@ const Report = Discourse.Model.extend({
switch (this.get("type")) {
case "flags": return "flag";
case "likes": return "heart";
- default: return null;
+ case "bookmarks": return "bookmark";
+ default: return null;
}
}.property("type"),
diff --git a/app/assets/javascripts/admin/models/web-hook.js.es6 b/app/assets/javascripts/admin/models/web-hook.js.es6
new file mode 100644
index 00000000000..e688a4dd0a1
--- /dev/null
+++ b/app/assets/javascripts/admin/models/web-hook.js.es6
@@ -0,0 +1,85 @@
+import RestModel from 'discourse/models/rest';
+import Category from 'discourse/models/category';
+import Group from 'discourse/models/group';
+import { default as computed, observes } from 'ember-addons/ember-computed-decorators';
+
+export default RestModel.extend({
+ content_type: 1, // json
+ last_delivery_status: 1, // inactive
+ wildcard_web_hook: false,
+ verify_certificate: true,
+ active: false,
+ web_hook_event_types: null,
+ categoriesFilter: null,
+ groupsFilterInName: null,
+
+ @computed('wildcard_web_hook')
+ webHookType: {
+ get(wildcard) {
+ return wildcard ? 'wildcard' : 'individual';
+ },
+ set(value) {
+ this.set('wildcard_web_hook', value === 'wildcard');
+ }
+ },
+
+ @observes('category_ids')
+ updateCategoriesFilter() {
+ this.set('categoriesFilter', Category.findByIds(this.get('category_ids')));
+ },
+
+ @observes('group_ids')
+ updateGroupsFilter() {
+ const groupIds = this.get('group_ids');
+ this.set('groupsFilterInName', Discourse.Site.currentProp('groups').reduce((groupNames, g) => {
+ if (groupIds.includes(g.id)) { groupNames.push(g.name); }
+ return groupNames;
+ }, []));
+ },
+
+ groupFinder(term) {
+ return Group.findAll({search: term, ignore_automatic: false});
+ },
+
+ @computed('wildcard_web_hook', 'web_hook_event_types.[]')
+ description(isWildcardWebHook, types) {
+ let desc = '';
+
+ types.forEach(type => {
+ const name = `${type.name.toLowerCase()}_event`;
+ desc += (desc !== '' ? `, ${name}` : name);
+ });
+
+ return (isWildcardWebHook ? '*' : desc);
+ },
+
+ createProperties() {
+ const types = this.get('web_hook_event_types');
+ const categories = this.get('categoriesFilter');
+ // Hack as {{group-selector}} accepts a comma-separated string as data source, but
+ // we use an array to populate the datasource above.
+ const groupsFilter = this.get('groupsFilterInName');
+ const groupNames = typeof groupsFilter === 'string' ? groupsFilter.split(',') : groupsFilter;
+
+ return {
+ payload_url: this.get('payload_url'),
+ content_type: this.get('content_type'),
+ secret: this.get('secret'),
+ wildcard_web_hook: this.get('wildcard_web_hook'),
+ verify_certificate: this.get('verify_certificate'),
+ active: this.get('active'),
+ web_hook_event_type_ids: Ember.isEmpty(types) ? [null] : types.map(type => type.id),
+ category_ids: Ember.isEmpty(categories) ? [null] : categories.map(c => c.id),
+ group_ids: Ember.isEmpty(groupNames) || Ember.isEmpty(groupNames[0]) ? [null] : Discourse.Site.currentProp('groups')
+ .reduce((groupIds, g) => {
+ if (groupNames.includes(g.name)) { groupIds.push(g.id); }
+ return groupIds;
+ }, [])
+ };
+ },
+
+ updateProperties() {
+ return this.createProperties();
+ }
+});
+
diff --git a/app/assets/javascripts/admin/routes/admin-api-index.js.es6 b/app/assets/javascripts/admin/routes/admin-api-index.js.es6
new file mode 100644
index 00000000000..f41f6bb7948
--- /dev/null
+++ b/app/assets/javascripts/admin/routes/admin-api-index.js.es6
@@ -0,0 +1,5 @@
+export default Ember.Route.extend({
+ beforeModel() {
+ this.transitionTo('adminApiKeys');
+ }
+});
diff --git a/app/assets/javascripts/admin/routes/admin-api.js.es6 b/app/assets/javascripts/admin/routes/admin-api-keys.js.es6
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-api.js.es6
rename to app/assets/javascripts/admin/routes/admin-api-keys.js.es6
diff --git a/app/assets/javascripts/admin/routes/admin-backups-logs.js.es6 b/app/assets/javascripts/admin/routes/admin-backups-logs.js.es6
index cd01295f5de..c036a107429 100644
--- a/app/assets/javascripts/admin/routes/admin-backups-logs.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-backups-logs.js.es6
@@ -5,17 +5,17 @@ export default Ember.Route.extend({
// since the logs are pushed via the message bus
// we only want to preload them (hence the beforeModel hook)
beforeModel() {
- const logsController = this.controllerFor("adminBackupsLogs");
+ const logs = this.controllerFor("adminBackupsLogs").get('logs');
// preload the logs if any
PreloadStore.getAndRemove("logs").then(function (preloadedLogs) {
if (preloadedLogs && preloadedLogs.length) {
// we need to filter out message like: "[SUCCESS]"
// and convert POJOs to Ember Objects
- const logs = _.chain(preloadedLogs)
- .reject(function (log) { return log.message.length === 0 || log.message[0] === "["; })
- .map(function (log) { return Em.Object.create(log); })
- .value();
- logsController.pushObjects(logs);
+ const newLogs = _.chain(preloadedLogs)
+ .reject(function (log) { return log.message.length === 0 || log.message[0] === "["; })
+ .map(function (log) { return Em.Object.create(log); })
+ .value();
+ logs.pushObjects(newLogs);
}
});
},
diff --git a/app/assets/javascripts/admin/routes/admin-backups.js.es6 b/app/assets/javascripts/admin/routes/admin-backups.js.es6
index d590019431e..95407e9ff30 100644
--- a/app/assets/javascripts/admin/routes/admin-backups.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-backups.js.es6
@@ -15,7 +15,7 @@ export default Discourse.Route.extend({
_processLogMessage(log) {
if (log.message === "[STARTED]") {
this.controllerFor("adminBackups").set("model.isOperationRunning", true);
- this.controllerFor("adminBackupsLogs").clear();
+ this.controllerFor("adminBackupsLogs").get('logs').clear();
} else if (log.message === "[FAILED]") {
this.controllerFor("adminBackups").set("model.isOperationRunning", false);
bootbox.alert(I18n.t("admin.backups.operations.failed", { operation: log.operation }));
@@ -27,7 +27,7 @@ export default Discourse.Route.extend({
window.location.pathname = Discourse.getURL("/");
}
} else {
- this.controllerFor("adminBackupsLogs").pushObject(Em.Object.create(log));
+ this.controllerFor("adminBackupsLogs").get('logs').pushObject(Em.Object.create(log));
}
},
@@ -49,7 +49,7 @@ export default Discourse.Route.extend({
actions: {
startBackup() {
- showModal('modals/admin-start-backup');
+ showModal('admin-start-backup', { admin: true });
this.controllerFor('modal').set('modalClass', 'start-backup-modal');
},
diff --git a/app/assets/javascripts/admin/routes/admin-badges-show.js.es6 b/app/assets/javascripts/admin/routes/admin-badges-show.js.es6
index 03d091d228d..cc0155181f7 100644
--- a/app/assets/javascripts/admin/routes/admin-badges-show.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-badges-show.js.es6
@@ -13,7 +13,7 @@ export default Ember.Route.extend({
name: I18n.t('admin.badges.new_badge')
});
}
- return this.modelFor('adminBadges').findProperty('id', parseInt(params.badge_id));
+ return this.modelFor('adminBadges').findBy('id', parseInt(params.badge_id));
},
actions: {
@@ -27,7 +27,7 @@ export default Ember.Route.extend({
editGroupings() {
const model = this.controllerFor('admin-badges').get('badgeGroupings');
- showModal('modals/admin-edit-badge-groupings', { model });
+ showModal('admin-edit-badge-groupings', { model, admin: true });
},
preview(badge, explain) {
@@ -42,7 +42,7 @@ export default Ember.Route.extend({
}
}).then(function(model) {
badge.set('preview_loading', false);
- showModal('modals/admin-badge-preview', { model });
+ showModal('admin-badge-preview', { model, admin: true });
}).catch(function(error) {
badge.set('preview_loading', false);
Em.Logger.error(error);
diff --git a/app/assets/javascripts/admin/routes/admin-badges.js.es6 b/app/assets/javascripts/admin/routes/admin-badges.js.es6
index 68da5edb6b1..96ecddab234 100644
--- a/app/assets/javascripts/admin/routes/admin-badges.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-badges.js.es6
@@ -5,21 +5,20 @@ import BadgeGrouping from 'discourse/models/badge-grouping';
export default Discourse.Route.extend({
_json: null,
- model: function() {
- var self = this;
- return ajax('/admin/badges.json').then(function(json) {
- self._json = json;
+ model() {
+ return ajax('/admin/badges.json').then(json => {
+ this._json = json;
return Badge.createFromJson(json);
});
},
- setupController: function(controller, model) {
- var json = this._json,
- triggers = [],
- badgeGroupings = [];
+ setupController(controller, model) {
+ const json = this._json;
+ const badgeTriggers = [];
+ const badgeGroupings = [];
_.each(json.admin_badges.triggers,function(v,k){
- triggers.push({id: v, name: I18n.t('admin.badges.trigger_type.'+k)});
+ badgeTriggers.push({id: v, name: I18n.t('admin.badges.trigger_type.'+k)});
});
json.badge_groupings.forEach(function(badgeGroupingJson) {
@@ -30,8 +29,8 @@ export default Discourse.Route.extend({
badgeGroupings: badgeGroupings,
badgeTypes: json.badge_types,
protectedSystemFields: json.admin_badges.protected_system_fields,
- badgeTriggers: triggers,
- model: model
+ badgeTriggers,
+ model
});
}
});
diff --git a/app/assets/javascripts/admin/routes/admin-customize-css-html-show.js.es6 b/app/assets/javascripts/admin/routes/admin-customize-css-html-show.js.es6
index dc38f3c51fb..7df829706fd 100644
--- a/app/assets/javascripts/admin/routes/admin-customize-css-html-show.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-customize-css-html-show.js.es6
@@ -1,7 +1,7 @@
export default Ember.Route.extend({
model(params) {
const all = this.modelFor('adminCustomizeCssHtml');
- const model = all.findProperty('id', parseInt(params.site_customization_id));
+ const model = all.findBy('id', parseInt(params.site_customization_id));
return model ? { model, section: params.section } : this.replaceWith('adminCustomizeCssHtml.index');
},
diff --git a/app/assets/javascripts/admin/routes/admin-customize-email-templates-edit.js.es6 b/app/assets/javascripts/admin/routes/admin-customize-email-templates-edit.js.es6
index b6e4e36bf9f..7c759995fb4 100644
--- a/app/assets/javascripts/admin/routes/admin-customize-email-templates-edit.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-customize-email-templates-edit.js.es6
@@ -3,7 +3,7 @@ import { scrollTop } from 'discourse/mixins/scroll-top';
export default Ember.Route.extend({
model(params) {
const all = this.modelFor('adminCustomizeEmailTemplates');
- return all.findProperty('id', params.id);
+ return all.findBy('id', params.id);
},
setupController(controller, emailTemplate) {
diff --git a/app/assets/javascripts/admin/routes/admin-email-index.js.es6 b/app/assets/javascripts/admin/routes/admin-email-index.js.es6
index 1b75e39f6f8..ae1272c0b9f 100644
--- a/app/assets/javascripts/admin/routes/admin-email-index.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-email-index.js.es6
@@ -3,9 +3,5 @@ import EmailSettings from 'admin/models/email-settings';
export default Discourse.Route.extend({
model() {
return EmailSettings.find();
- },
-
- renderTemplate() {
- this.render('admin/templates/email_index', { into: 'adminEmail' });
}
});
diff --git a/app/assets/javascripts/admin/routes/admin-email-rejected.js.es6 b/app/assets/javascripts/admin/routes/admin-email-rejected.js.es6
index a7819b31a60..22c4141275e 100644
--- a/app/assets/javascripts/admin/routes/admin-email-rejected.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-email-rejected.js.es6
@@ -6,7 +6,7 @@ export default AdminEmailIncomings.extend({
actions: {
showIncomingEmail(id) {
- showModal('modals/admin-incoming-email');
+ showModal('admin-incoming-email', { admin: true });
this.controllerFor("modals/admin-incoming-email").load(id);
}
}
diff --git a/app/assets/javascripts/admin/routes/admin-flags-list.js.es6 b/app/assets/javascripts/admin/routes/admin-flags-list.js.es6
index ebbc3e6d2bc..ba00186d90e 100644
--- a/app/assets/javascripts/admin/routes/admin-flags-list.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-flags-list.js.es6
@@ -14,12 +14,12 @@ export default Discourse.Route.extend({
actions: {
showAgreeFlagModal(model) {
- showModal('modals/admin-agree-flag', { model });
+ showModal('admin-agree-flag', { model, admin: true });
this.controllerFor('modal').set('modalClass', 'agree-flag-modal');
},
showDeleteFlagModal(model) {
- showModal('modals/admin-delete-flag', { model });
+ showModal('admin-delete-flag', { model, admin: true });
this.controllerFor('modal').set('modalClass', 'delete-flag-modal');
}
diff --git a/app/assets/javascripts/admin/routes/admin-group.js.es6 b/app/assets/javascripts/admin/routes/admin-group.js.es6
index 298bffaa434..3575496edd4 100644
--- a/app/assets/javascripts/admin/routes/admin-group.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-group.js.es6
@@ -7,8 +7,7 @@ export default Discourse.Route.extend({
return Group.create({ automatic: false, visible: true });
}
- const group = this.modelFor('adminGroupsType')
- .findProperty('name', params.name);
+ const group = this.modelFor('adminGroupsType').findBy('name', params.name);
if (!group) { return this.transitionTo('adminGroups.index'); }
diff --git a/app/assets/javascripts/admin/routes/admin-logs-screened-emails.js.es6 b/app/assets/javascripts/admin/routes/admin-logs-screened-emails.js.es6
index 1008dc1c1db..d31e5219242 100644
--- a/app/assets/javascripts/admin/routes/admin-logs-screened-emails.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-logs-screened-emails.js.es6
@@ -1,6 +1,6 @@
export default Discourse.Route.extend({
renderTemplate: function() {
- this.render('admin/templates/logs/screened_emails', {into: 'adminLogs'});
+ this.render('admin/templates/logs/screened-emails', {into: 'adminLogs'});
},
setupController: function() {
diff --git a/app/assets/javascripts/admin/routes/admin-logs-screened-ip-addresses.js.es6 b/app/assets/javascripts/admin/routes/admin-logs-screened-ip-addresses.js.es6
index ca914fe1d26..c6518c244c8 100644
--- a/app/assets/javascripts/admin/routes/admin-logs-screened-ip-addresses.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-logs-screened-ip-addresses.js.es6
@@ -1,6 +1,6 @@
export default Discourse.Route.extend({
renderTemplate() {
- this.render('admin/templates/logs/screened_ip_addresses', {into: 'adminLogs'});
+ this.render('admin/templates/logs/screened-ip-addresses', {into: 'adminLogs'});
},
setupController() {
diff --git a/app/assets/javascripts/admin/routes/admin-logs-screened-urls.js.es6 b/app/assets/javascripts/admin/routes/admin-logs-screened-urls.js.es6
index 093dd263319..ee65fda0900 100644
--- a/app/assets/javascripts/admin/routes/admin-logs-screened-urls.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-logs-screened-urls.js.es6
@@ -1,6 +1,6 @@
export default Discourse.Route.extend({
renderTemplate: function() {
- this.render('admin/templates/logs/screened_urls', {into: 'adminLogs'});
+ this.render('admin/templates/logs/screened-urls', {into: 'adminLogs'});
},
setupController: function() {
diff --git a/app/assets/javascripts/admin/routes/admin-logs-staff-action-logs.js.es6 b/app/assets/javascripts/admin/routes/admin-logs-staff-action-logs.js.es6
index 6ef900e8436..48d04abc5f7 100644
--- a/app/assets/javascripts/admin/routes/admin-logs-staff-action-logs.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-logs-staff-action-logs.js.es6
@@ -3,7 +3,7 @@ import showModal from 'discourse/lib/show-modal';
export default Discourse.Route.extend({
// TODO: make this automatic using an `{{outlet}}`
renderTemplate: function() {
- this.render('admin/templates/logs/staff_action_logs', {into: 'adminLogs'});
+ this.render('admin/templates/logs/staff-action-logs', {into: 'adminLogs'});
},
setupController: function(controller) {
@@ -13,13 +13,18 @@ export default Discourse.Route.extend({
actions: {
showDetailsModal(model) {
- showModal('modals/admin-staff-action-log-details', { model });
+ showModal('admin-staff-action-log-details', { model, admin: true });
this.controllerFor('modal').set('modalClass', 'log-details-modal');
},
showCustomDetailsModal(model) {
- const modalName = "modals/" + (model.action_name + '_details').replace("_", "-");
- showModal(modalName, { model });
+ const modalName = (model.action_name + '_details').replace(/\_/g, "-");
+
+ showModal(modalName, {
+ model,
+ admin: true,
+ templateName: 'site-customization-change'
+ });
this.controllerFor('modal').set('modalClass', 'tabbed-modal log-details-modal');
}
}
diff --git a/app/assets/javascripts/admin/routes/admin-route-map.js.es6 b/app/assets/javascripts/admin/routes/admin-route-map.js.es6
index 8c1f988af37..bd38784bb7f 100644
--- a/app/assets/javascripts/admin/routes/admin-route-map.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-route-map.js.es6
@@ -1,13 +1,11 @@
-export default {
- resource: 'admin',
-
- map() {
+export default function() {
+ this.route('admin', { resetNamespace: true }, function() {
this.route('dashboard', { path: '/' });
- this.resource('adminSiteSettings', { path: '/site_settings' }, function() {
- this.resource('adminSiteSettingsCategory', { path: 'category/:category_id'} );
+ this.route('adminSiteSettings', { path: '/site_settings', resetNamespace: true }, function() {
+ this.route('adminSiteSettingsCategory', { path: 'category/:category_id', resetNamespace: true} );
});
- this.resource('adminEmail', { path: '/email'}, function() {
+ this.route('adminEmail', { path: '/email', resetNamespace: true}, function() {
this.route('sent');
this.route('skipped');
this.route('bounced');
@@ -16,65 +14,77 @@ export default {
this.route('previewDigest', { path: '/preview-digest' });
});
- this.resource('adminCustomize', { path: '/customize' } ,function() {
+ this.route('adminCustomize', { path: '/customize', resetNamespace: true } ,function() {
this.route('colors');
- this.resource('adminCustomizeCssHtml', { path: 'css_html' }, function() {
+ this.route('adminCustomizeCssHtml', { path: 'css_html', resetNamespace: true }, function() {
this.route('show', {path: '/:site_customization_id/:section'});
});
- this.resource('adminSiteText', { path: '/site_texts' }, function() {
+ this.route('adminSiteText', { path: '/site_texts', resetNamespace: true }, function() {
this.route('edit', { path: '/:id' });
});
- this.resource('adminUserFields', { path: '/user_fields' });
- this.resource('adminEmojis', { path: '/emojis' });
- this.resource('adminPermalinks', { path: '/permalinks' });
- this.resource('adminEmbedding', { path: '/embedding' });
- this.resource('adminCustomizeEmailTemplates', { path: '/email_templates' }, function() {
+ this.route('adminUserFields', { path: '/user_fields', resetNamespace: true });
+ this.route('adminEmojis', { path: '/emojis', resetNamespace: true });
+ this.route('adminPermalinks', { path: '/permalinks', resetNamespace: true });
+ this.route('adminEmbedding', { path: '/embedding', resetNamespace: true });
+ this.route('adminCustomizeEmailTemplates', { path: '/email_templates', resetNamespace: true }, function() {
this.route('edit', { path: '/:id' });
});
});
- this.route('api');
- this.resource('admin.backups', { path: '/backups' }, function() {
+ this.route('adminApi', { path: '/api', resetNamespace: true }, function() {
+ this.route('adminApiKeys', { path: '/keys', resetNamespace: true });
+
+ this.route('adminWebHooks', { path: '/web_hooks', resetNamespace: true }, function() {
+ this.route('show', { path: '/:web_hook_id' });
+ this.route('showEvents', { path: '/:web_hook_id/events' });
+ });
+ });
+
+ this.route('admin.backups', { path: '/backups', resetNamespace: true }, function() {
this.route('logs');
});
- this.resource('adminReports', { path: '/reports/:type' });
+ this.route('adminReports', { path: '/reports/:type', resetNamespace: true });
- this.resource('adminFlags', { path: '/flags' }, function() {
+ this.route('adminFlags', { path: '/flags', resetNamespace: true }, function() {
this.route('list', { path: '/:filter' });
});
- this.resource('adminLogs', { path: '/logs' }, function() {
+ this.route('adminLogs', { path: '/logs', resetNamespace: true }, function() {
this.route('staffActionLogs', { path: '/staff_action_logs' });
this.route('screenedEmails', { path: '/screened_emails' });
this.route('screenedIpAddresses', { path: '/screened_ip_addresses' });
this.route('screenedUrls', { path: '/screened_urls' });
});
- this.resource('adminGroups', { path: '/groups' }, function() {
+ this.route('adminGroups', { path: '/groups', resetNamespace: true }, function() {
this.route('bulk');
this.route('bulkComplete', { path: 'bulk-complete' });
- this.resource('adminGroupsType', { path: '/:type' }, function() {
- this.resource('adminGroup', { path: '/:name' });
+ this.route('adminGroupsType', { path: '/:type', resetNamespace: true }, function() {
+ this.route('adminGroup', { path: '/:name', resetNamespace: true });
});
});
- this.resource('adminUsers', { path: '/users' }, function() {
- this.resource('adminUser', { path: '/:user_id/:username' }, function() {
+ this.route('adminUsers', { path: '/users', resetNamespace: true }, function() {
+ this.route('adminUser', { path: '/:user_id/:username', resetNamespace: true }, function() {
this.route('badges');
this.route('tl3Requirements', { path: '/tl3_requirements' });
});
- this.resource('adminUsersList', { path: '/list' }, function() {
+ this.route('adminUsersList', { path: '/list', resetNamespace: true }, function() {
this.route('show', { path: '/:filter' });
});
});
- this.resource('adminBadges', { path: '/badges' }, function() {
+ this.route('adminBadges', { path: '/badges', resetNamespace: true }, function() {
this.route('show', { path: '/:badge_id' });
});
- }
+
+ this.route('adminPlugins', { path: '/plugins', resetNamespace: true }, function() {
+ this.route('index', { path: '/' });
+ });
+ });
};
diff --git a/app/assets/javascripts/admin/routes/admin-user-index.js.es6 b/app/assets/javascripts/admin/routes/admin-user-index.js.es6
index 5a3afa10caa..c10e5957d5a 100644
--- a/app/assets/javascripts/admin/routes/admin-user-index.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-user-index.js.es6
@@ -26,7 +26,7 @@ export default Discourse.Route.extend({
actions: {
showSuspendModal(model) {
- showModal('modals/admin-suspend-user', { model });
+ showModal('admin-suspend-user', { model, admin: true });
this.controllerFor('modal').set('modalClass', 'suspend-user-modal');
}
}
diff --git a/app/assets/javascripts/admin/routes/admin-web-hooks-show-events.js.es6 b/app/assets/javascripts/admin/routes/admin-web-hooks-show-events.js.es6
new file mode 100644
index 00000000000..c9700db463c
--- /dev/null
+++ b/app/assets/javascripts/admin/routes/admin-web-hooks-show-events.js.es6
@@ -0,0 +1,18 @@
+export default Discourse.Route.extend({
+ model(params) {
+ return this.store.findAll('web-hook-event', Ember.get(params, 'web_hook_id'));
+ },
+
+ setupController(controller, model) {
+ controller.set('model', model);
+ controller.subscribe();
+ },
+
+ deactivate() {
+ this.controllerFor('adminWebHooks.showEvents').unsubscribe();
+ },
+
+ renderTemplate() {
+ this.render('admin/templates/web-hooks-show-events', { into: 'adminApi' });
+ }
+});
diff --git a/app/assets/javascripts/admin/routes/admin-web-hooks-show.js.es6 b/app/assets/javascripts/admin/routes/admin-web-hooks-show.js.es6
new file mode 100644
index 00000000000..51b7d55d47c
--- /dev/null
+++ b/app/assets/javascripts/admin/routes/admin-web-hooks-show.js.es6
@@ -0,0 +1,26 @@
+export default Discourse.Route.extend({
+ serialize(model) {
+ return { web_hook_id: model.get('id') || 'new' };
+ },
+
+ model(params) {
+ if (params.web_hook_id === 'new') {
+ return this.store.createRecord('web-hook');
+ }
+ return this.store.find('web-hook', Ember.get(params, 'web_hook_id'));
+ },
+
+ setupController(controller, model) {
+ if (model.get('isNew') || Ember.isEmpty(model.get('web_hook_event_types'))) {
+ model.set('web_hook_event_types', controller.get('defaultEventTypes'));
+ }
+
+ model.set('category_ids', model.get('category_ids'));
+ model.set('group_ids', model.get('group_ids'));
+ controller.setProperties({ model, saved: false });
+ },
+
+ renderTemplate() {
+ this.render('admin/templates/web-hooks-show', { into: 'adminApi' });
+ }
+});
diff --git a/app/assets/javascripts/admin/routes/admin-web-hooks.js.es6 b/app/assets/javascripts/admin/routes/admin-web-hooks.js.es6
new file mode 100644
index 00000000000..69d7b4bd202
--- /dev/null
+++ b/app/assets/javascripts/admin/routes/admin-web-hooks.js.es6
@@ -0,0 +1,15 @@
+export default Ember.Route.extend({
+ model() {
+ return this.store.findAll('web-hook');
+ },
+
+ setupController(controller, model) {
+ controller.setProperties({
+ model,
+ eventTypes: model.extras.event_types,
+ defaultEventTypes: model.extras.default_event_types,
+ contentTypes: model.extras.content_types,
+ deliveryStatuses: model.extras.delivery_statuses
+ });
+ }
+});
diff --git a/app/assets/javascripts/admin/templates/admin.hbs b/app/assets/javascripts/admin/templates/admin.hbs
index 13afd577f77..7f34c00b772 100644
--- a/app/assets/javascripts/admin/templates/admin.hbs
+++ b/app/assets/javascripts/admin/templates/admin.hbs
@@ -1,4 +1,4 @@
-
+{{#disable-custom-stylesheets class="container"}}
@@ -19,11 +19,11 @@
{{nav-item route='adminLogs' label='admin.logs.title'}}
{{#if currentUser.admin}}
{{nav-item route='adminCustomize' label='admin.customize.title'}}
- {{nav-item route='admin.api' label='admin.api.title'}}
+ {{nav-item route='adminApi' label='admin.api.title'}}
{{nav-item route='admin.backups' label='admin.backups.title'}}
{{/if}}
{{nav-item route='adminPlugins' label='admin.plugins.title'}}
- {{plugin-outlet "admin-menu" tagName="li"}}
+ {{plugin-outlet name="admin-menu" connectorTagName="li"}}
@@ -34,4 +34,4 @@
-
+{{/disable-custom-stylesheets}}
diff --git a/app/assets/javascripts/admin/templates/api-keys.hbs b/app/assets/javascripts/admin/templates/api-keys.hbs
new file mode 100644
index 00000000000..60449052bb9
--- /dev/null
+++ b/app/assets/javascripts/admin/templates/api-keys.hbs
@@ -0,0 +1,33 @@
+{{#if model}}
+
+
+ {{i18n 'admin.api.key'}}
+ {{i18n 'admin.api.user'}}
+
+
+ {{#each model as |k|}}
+
+ {{k.key}}
+
+ {{#if k.user}}
+ {{#link-to 'adminUser' k.user}}
+ {{avatar k.user imageSize="small"}}
+ {{/link-to}}
+ {{else}}
+ {{i18n 'admin.api.all_users'}}
+ {{/if}}
+
+
+ {{d-button action="regenerateKey" actionParam=k icon="undo" label='admin.api.regenerate'}}
+ {{d-button action="revokeKey" actionParam=k icon="times" label='admin.api.revoke'}}
+
+
+ {{/each}}
+
+{{else}}
+ {{i18n 'admin.api.none'}}
+{{/if}}
+
+{{#unless hasMasterKey}}
+
+{{/unless}}
diff --git a/app/assets/javascripts/admin/templates/api.hbs b/app/assets/javascripts/admin/templates/api.hbs
index 0f2e65b89c3..f3407fe0ccf 100644
--- a/app/assets/javascripts/admin/templates/api.hbs
+++ b/app/assets/javascripts/admin/templates/api.hbs
@@ -1,33 +1,10 @@
-{{#if model}}
-
-
- {{i18n 'admin.api.key'}}
- {{i18n 'admin.api.user'}}
-
-
- {{#each model as |k|}}
-
- {{k.key}}
-
- {{#if k.user}}
- {{#link-to 'adminUser' k.user}}
- {{avatar k.user imageSize="small"}}
- {{/link-to}}
- {{else}}
- {{i18n 'admin.api.all_users'}}
- {{/if}}
-
-
-
-
-
-
- {{/each}}
-
-{{else}}
- {{i18n 'admin.api.none'}}
-{{/if}}
+
+ {{#admin-nav}}
+ {{nav-item route='adminApiKeys' label='admin.api.title'}}
+ {{nav-item route='adminWebHooks' label='admin.web_hooks.title'}}
+ {{/admin-nav}}
-{{#unless hasMasterKey}}
-
-{{/unless }}
+
+ {{outlet}}
+
+
diff --git a/app/assets/javascripts/admin/templates/backups_index.hbs b/app/assets/javascripts/admin/templates/backups-index.hbs
similarity index 62%
rename from app/assets/javascripts/admin/templates/backups_index.hbs
rename to app/assets/javascripts/admin/templates/backups-index.hbs
index c7323ebea02..a8220a4e1ac 100644
--- a/app/assets/javascripts/admin/templates/backups_index.hbs
+++ b/app/assets/javascripts/admin/templates/backups-index.hbs
@@ -6,9 +6,9 @@
{{resumable-upload target="/admin/backups/upload" success="uploadSuccess" error="uploadError" uploadText=uploadLabel title="admin.backups.upload.title"}}
{{#if site.isReadOnly}}
- {{d-button icon="eye" action="toggleReadOnlyMode" disabled=status.model.isOperationRunning title="admin.backups.read_only.disable.title" label="admin.backups.read_only.disable.label"}}
+ {{d-button icon="eye" action="toggleReadOnlyMode" disabled=status.isOperationRunning title="admin.backups.read_only.disable.title" label="admin.backups.read_only.disable.label"}}
{{else}}
- {{d-button icon="eye" action="toggleReadOnlyMode" disabled=status.model.isOperationRunning title="admin.backups.read_only.enable.title" label="admin.backups.read_only.enable.label"}}
+ {{d-button icon="eye" action="toggleReadOnlyMode" disabled=status.isOperationRunning title="admin.backups.read_only.enable.title" label="admin.backups.read_only.enable.label"}}
{{/if}}
@@ -19,13 +19,18 @@
{{human-size backup.size}}
- {{fa-icon "download"}}{{i18n 'admin.backups.operations.download.label'}}
- {{#if status.model.isOperationRunning}}
+ {{d-button class="download"
+ action="download"
+ actionParam=backup
+ icon="download"
+ title="admin.backups.operations.download.title"
+ label="admin.backups.operations.download.label"}}
+ {{#if status.isOperationRunning}}
{{d-button icon="trash-o" action="destroyBackup" actionParam=backup class="btn-danger" disabled="true" title="admin.backups.operations.is_running"}}
- {{d-button icon="play" action="startRestore" actionParam=backup disabled=status.model.restoreDisabled title=restoreTitle label="admin.backups.operations.restore.label"}}
+ {{d-button icon="play" action="startRestore" actionParam=backup disabled=status.restoreDisabled title=restoreTitle label="admin.backups.operations.restore.label"}}
{{else}}
{{d-button icon="trash-o" action="destroyBackup" actionParam=backup class="btn-danger" title="admin.backups.operations.destroy.title"}}
- {{d-button icon="play" action="startRestore" actionParam=backup disabled=status.model.restoreDisabled title=restoreTitle label="admin.backups.operations.restore.label"}}
+ {{d-button icon="play" action="startRestore" actionParam=backup disabled=status.restoreDisabled title=restoreTitle label="admin.backups.operations.restore.label"}}
{{/if}}
diff --git a/app/assets/javascripts/admin/templates/backups-logs.hbs b/app/assets/javascripts/admin/templates/backups-logs.hbs
new file mode 100644
index 00000000000..34ec15f84a7
--- /dev/null
+++ b/app/assets/javascripts/admin/templates/backups-logs.hbs
@@ -0,0 +1 @@
+{{admin-backups-logs logs=logs status=status}}
diff --git a/app/assets/javascripts/admin/templates/backups.hbs b/app/assets/javascripts/admin/templates/backups.hbs
index 7562754c08c..ea8bc189873 100644
--- a/app/assets/javascripts/admin/templates/backups.hbs
+++ b/app/assets/javascripts/admin/templates/backups.hbs
@@ -1,35 +1,37 @@
-
-
-
+
+
+
+
+
+
+ {{#if model.canRollback}}
+ {{d-button action="rollback"
+ class="btn-rollback"
+ label="admin.backups.operations.rollback.label"
+ title="admin.backups.operations.rollback.title"
+ icon="ambulance"
+ disabled=rollbackDisabled}}
+ {{/if}}
+ {{#if model.isOperationRunning}}
+ {{d-button action="cancelOperation"
+ class="btn-danger"
+ title="admin.backups.operations.cancel.title"
+ label="admin.backups.operations.cancel.label"
+ icon="times"}}
+ {{else}}
+ {{d-button action="startBackup"
+ class="btn-primary"
+ title="admin.backups.operations.backup.title"
+ label="admin.backups.operations.backup.label"
+ icon="rocket"}}
+ {{/if}}
+
-
- {{#if model.canRollback}}
- {{d-button action="rollback"
- class="btn-rollback"
- label="admin.backups.operations.rollback.label"
- title="admin.backups.operations.rollback.title"
- icon="ambulance"
- disabled=rollbackDisabled}}
- {{/if}}
- {{#if model.isOperationRunning}}
- {{d-button action="cancelOperation"
- class="btn-danger"
- title="admin.backups.operations.cancel.title"
- label="admin.backups.operations.cancel.label"
- icon="times"}}
- {{else}}
- {{d-button action="startBackup"
- class="btn-primary"
- title="admin.backups.operations.backup.title"
- label="admin.backups.operations.backup.label"
- icon="rocket"}}
- {{/if}}
-
-
-
- {{outlet}}
+
+ {{outlet}}
+
diff --git a/app/assets/javascripts/admin/templates/badges-index.hbs b/app/assets/javascripts/admin/templates/badges-index.hbs
index 6ee80748f81..c94f59fe105 100644
--- a/app/assets/javascripts/admin/templates/badges-index.hbs
+++ b/app/assets/javascripts/admin/templates/badges-index.hbs
@@ -1,4 +1,4 @@
-
+{{#d-section class="current-badge span13"}}
{{i18n 'admin.badges.none_selected'}}
@@ -6,4 +6,4 @@
{{fa-icon "plus"}} {{i18n 'admin.badges.new'}}
{{/link-to}}
-
+{{/d-section}}
diff --git a/app/assets/javascripts/admin/templates/badges-show.hbs b/app/assets/javascripts/admin/templates/badges-show.hbs
index f29829eba55..e0ae7001df0 100644
--- a/app/assets/javascripts/admin/templates/badges-show.hbs
+++ b/app/assets/javascripts/admin/templates/badges-show.hbs
@@ -1,4 +1,4 @@
-
+{{#d-section class="current-badge span13"}}
-
+{{/d-section}}
{{#if grant_count}}
diff --git a/app/assets/javascripts/admin/templates/components/ace-editor.hbs b/app/assets/javascripts/admin/templates/components/ace-editor.hbs
new file mode 100644
index 00000000000..c837b2b34ee
--- /dev/null
+++ b/app/assets/javascripts/admin/templates/components/ace-editor.hbs
@@ -0,0 +1 @@
+{{content}}
diff --git a/app/assets/javascripts/admin/templates/components/admin-web-hook-event-chooser.hbs b/app/assets/javascripts/admin/templates/components/admin-web-hook-event-chooser.hbs
new file mode 100644
index 00000000000..0ecb553d38e
--- /dev/null
+++ b/app/assets/javascripts/admin/templates/components/admin-web-hook-event-chooser.hbs
@@ -0,0 +1,3 @@
+{{input id=typeName type="checkbox" name="event-choice" checked=enabled}}
+
+{{details}}
diff --git a/app/assets/javascripts/admin/templates/components/admin-web-hook-event.hbs b/app/assets/javascripts/admin/templates/components/admin-web-hook-event.hbs
new file mode 100644
index 00000000000..026b6daae27
--- /dev/null
+++ b/app/assets/javascripts/admin/templates/components/admin-web-hook-event.hbs
@@ -0,0 +1,19 @@
+
+ {{model.status}}
+
+{{model.id}}
+
+{{completion}}
+
+ {{d-button icon='ellipsis-v' action='toggleRequest' label='admin.web_hooks.events.request'}}
+ {{d-button icon='ellipsis-v' action='toggleResponse' label='admin.web_hooks.events.response'}}
+ {{d-button icon='refresh' action='redeliver' label='admin.web_hooks.events.redeliver'}}
+
+{{#if expandDetails}}
+
+ {{i18n 'admin.web_hooks.events.headers'}}
+ {{headers}}
+ {{bodyLabel}}
+ {{body}}
+
+{{/if}}
diff --git a/app/assets/javascripts/admin/templates/components/embeddable-host.hbs b/app/assets/javascripts/admin/templates/components/embeddable-host.hbs
index c35d40e1d6e..5f2581138f5 100644
--- a/app/assets/javascripts/admin/templates/components/embeddable-host.hbs
+++ b/app/assets/javascripts/admin/templates/components/embeddable-host.hbs
@@ -2,6 +2,9 @@
{{input value=buffered.host placeholder="example.com" enter="save" class="host-name"}}
+
+ {{input value=buffered.path_whitelist placeholder="/blog/.*" enter="save" class="path-whitelist"}}
+
{{category-chooser value=categoryId}}
@@ -11,6 +14,7 @@
{{else}}
{{host.host}}
+ {{host.path_whitelist}}
{{category-badge host.category}}
{{d-button icon="pencil" action="edit"}}
diff --git a/app/assets/javascripts/admin/templates/components/permalink-form.hbs b/app/assets/javascripts/admin/templates/components/permalink-form.hbs
index 987a1bc9185..c7942543316 100644
--- a/app/assets/javascripts/admin/templates/components/permalink-form.hbs
+++ b/app/assets/javascripts/admin/templates/components/permalink-form.hbs
@@ -2,4 +2,4 @@
{{text-field value=url disabled=formSubmitted class="permalink-url" placeholderKey="admin.permalink.url" autocorrect="off" autocapitalize="off"}}
{{combo-box content=permalinkTypes value=permalinkType}}
{{text-field value=permalink_type_value disabled=formSubmitted class="external-url" placeholderKey=permalinkTypePlaceholder autocorrect="off" autocapitalize="off"}}
-
+{{d-button action="submit" disabled=formSubmitted label="admin.permalink.form.add"}}
diff --git a/app/assets/javascripts/admin/templates/components/permalinks-list.hbs b/app/assets/javascripts/admin/templates/components/permalinks-list.hbs
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/app/assets/javascripts/admin/templates/components/site-customization-change-details.hbs b/app/assets/javascripts/admin/templates/components/site-customization-change-details.hbs
new file mode 100644
index 00000000000..a9ea9cea094
--- /dev/null
+++ b/app/assets/javascripts/admin/templates/components/site-customization-change-details.hbs
@@ -0,0 +1,18 @@
+
+ {{i18n 'admin.customize.enabled'}}: {{change.enabled}}
+
+
+{{site-customization-change-field field=change.stylesheet name="admin.customize.css"}}
+{{site-customization-change-field icon="mobile" field=change.mobile_stylesheet name="admin.customize.css"}}
+
+{{site-customization-change-field field=change.header name="admin.customize.header"}}
+{{site-customization-change-field icon="mobile" field=change.mobile_header name="admin.customize.header"}}
+
+{{site-customization-change-field field=change.top name="admin.customize.top"}}
+{{site-customization-change-field icon="mobile" field=change.mobile_top name="admin.customize.top"}}
+
+{{site-customization-change-field field=change.footer name="admin.customize.footer"}}
+{{site-customization-change-field icon="mobile" field=change.mobile_footer name="admin.customize.footer"}}
+
+{{site-customization-change-field icon="file-text-o" field=change.head_tag name="admin.customize.head_tag.text"}}
+{{site-customization-change-field icon="file-text-o" field=change.body_tag name="admin.customize.body_tag.text"}}
diff --git a/app/assets/javascripts/admin/templates/components/site-customization-change-field.hbs b/app/assets/javascripts/admin/templates/components/site-customization-change-field.hbs
new file mode 100644
index 00000000000..43aea18163f
--- /dev/null
+++ b/app/assets/javascripts/admin/templates/components/site-customization-change-field.hbs
@@ -0,0 +1,7 @@
+{{#if field}}
+
+ {{i18n name}}: ({{i18n 'character_count' count=field.length}})
+
+ {{textarea value=field class="plain"}}
+
+{{/if}}
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/category-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/category-list.hbs
index 621f3fa70e7..8c0b4eda1e9 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/category-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/category-list.hbs
@@ -1,3 +1,3 @@
-{{category-group categories=selectedCategories blacklist=selectedCategories}}
+{{category-selector categories=selectedCategories blacklist=selectedCategories}}
{{{unbound setting.description}}}
{{setting-validation-message message=validationMessage}}
diff --git a/app/assets/javascripts/admin/templates/customize_colors.hbs b/app/assets/javascripts/admin/templates/customize-colors.hbs
similarity index 100%
rename from app/assets/javascripts/admin/templates/customize_colors.hbs
rename to app/assets/javascripts/admin/templates/customize-colors.hbs
diff --git a/app/assets/javascripts/admin/templates/dashboard.hbs b/app/assets/javascripts/admin/templates/dashboard.hbs
index e02a5a925ca..ec7753ac6c9 100644
--- a/app/assets/javascripts/admin/templates/dashboard.hbs
+++ b/app/assets/javascripts/admin/templates/dashboard.hbs
@@ -1,4 +1,4 @@
-{{plugin-outlet "admin-dashboard-top"}}
+{{plugin-outlet name="admin-dashboard-top"}}
{{#conditional-loading-spinner condition=loading}}
diff --git a/app/assets/javascripts/admin/templates/email_index.hbs b/app/assets/javascripts/admin/templates/email-index.hbs
similarity index 100%
rename from app/assets/javascripts/admin/templates/email_index.hbs
rename to app/assets/javascripts/admin/templates/email-index.hbs
diff --git a/app/assets/javascripts/admin/templates/email_preview_digest.hbs b/app/assets/javascripts/admin/templates/email-preview-digest.hbs
similarity index 50%
rename from app/assets/javascripts/admin/templates/email_preview_digest.hbs
rename to app/assets/javascripts/admin/templates/email-preview-digest.hbs
index 7bd2a4455f1..80f48717b02 100644
--- a/app/assets/javascripts/admin/templates/email_preview_digest.hbs
+++ b/app/assets/javascripts/admin/templates/email-preview-digest.hbs
@@ -19,9 +19,36 @@
{{#conditional-loading-spinner condition=loading}}
- {{#if showHtml}}
- {{{model.html_content}}}
- {{else}}
- {{{model.text_content}}}
+
+
+ {{#if showSendEmailForm}}
+
+
+ {{#if sendingEmail}}
+ {{i18n 'admin.email.sending_test'}}
+ {{else}}
+
+ {{text-field value=email placeholderKey="admin.email.test_email_address"}}
+
+ {{#if sentEmail}}
+
+ {{/if}}
+ {{/if}}
+
+
{{/if}}
+
+
+ {{#if showHtml}}
+ {{#if htmlEmpty}}
+ {{i18n 'admin.email.no_result'}}
+ {{else}}
+
+ {{/if}}
+ {{else}}
+ {{{model.text_content}}}
+ {{/if}}
+
+
+
{{/conditional-loading-spinner}}
diff --git a/app/assets/javascripts/admin/templates/embedding.hbs b/app/assets/javascripts/admin/templates/embedding.hbs
index 6fbe31c124c..5db5cb6bfa8 100644
--- a/app/assets/javascripts/admin/templates/embedding.hbs
+++ b/app/assets/javascripts/admin/templates/embedding.hbs
@@ -2,9 +2,10 @@
{{#if embedding.embeddable_hosts}}
- {{i18n "admin.embedding.host"}}
+ {{i18n "admin.embedding.host"}}
+ {{i18n "admin.embedding.path_whitelist"}}
{{i18n "admin.embedding.category"}}
-
+
{{#each embedding.embeddable_hosts as |host|}}
{{embeddable-host host=host deleteHost="deleteHost"}}
@@ -30,6 +31,9 @@
{{embedding-setting field="embed_by_username" value=embedding.embed_by_username}}
{{embedding-setting field="embed_post_limit" value=embedding.embed_post_limit}}
+ {{embedding-setting field="embed_title_scrubber"
+ value=embedding.embed_title_scrubber
+ placeholder="- site.com$"}}
{{embedding-setting field="embed_truncate" value=embedding.embed_truncate type="checkbox"}}
diff --git a/app/assets/javascripts/admin/templates/emojis.hbs b/app/assets/javascripts/admin/templates/emojis.hbs
index ca6fd742d4c..6f35c097a96 100644
--- a/app/assets/javascripts/admin/templates/emojis.hbs
+++ b/app/assets/javascripts/admin/templates/emojis.hbs
@@ -5,7 +5,7 @@
{{emoji-uploader done="emojiUploaded"}}
- {{#if model}}
+ {{#if sortedEmojis}}
@@ -16,9 +16,9 @@
- {{#each model as |e|}}
+ {{#each sortedEmojis as |e|}}
- 
:{{e.name}}:
diff --git a/app/assets/javascripts/admin/templates/group.hbs b/app/assets/javascripts/admin/templates/group.hbs
index 2c2a1929a34..095b3f5f4b8 100644
--- a/app/assets/javascripts/admin/templates/group.hbs
+++ b/app/assets/javascripts/admin/templates/group.hbs
@@ -4,13 +4,23 @@
{{#if model.automatic}}
{{model.name}}
{{else}}
-
- {{text-field name="name" value=model.name placeholderKey="admin.groups.name_placeholder"}}
+
+ {{text-field name="name" value=model.name placeholderKey="groups.name_placeholder"}}
{{/if}}
{{#if model.id}}
{{#unless model.automatic}}
+
+
+ {{input type='text' name='full_name' value=model.full_name class='group-edit-full-name'}}
+
+
+
+
+ {{d-editor value=model.bio_raw}}
+
+
{{#if model.hasOwners}}
@@ -28,26 +38,8 @@
{{/unless}}
-
-
- {{fa-icon "fast-backward"}}
- {{currentPage}}/{{totalPages}}
- {{fa-icon "fast-forward"}}
-
-
- {{#each model.members as |member|}}
- {{group-member member=member automatic=model.automatic removeAction="removeMember"}}
- {{/each}}
-
+ {{group-members-input model=model}}
-
- {{#unless model.automatic}}
-
-
- {{user-selector usernames=model.usernames placeholderKey="admin.groups.selector_placeholder" id="user-selector"}}
- {{d-button action="addMembers" class="add" icon="plus" label="admin.groups.add"}}
-
- {{/unless}}
{{/if}}
@@ -58,12 +50,32 @@
{{#unless model.automatic}}
-
-
-
+
+
+
+
+
+
+
+
+
+
+
{{/unless}}
@@ -94,13 +106,16 @@
{{#if siteSettings.email_in}}
- {{#plugin-outlet "group-email-in"}}
{{text-field name="incoming_email" value=model.incoming_email placeholderKey="admin.groups.incoming_email_placeholder"}}
- {{/plugin-outlet}}
+ {{plugin-outlet name="group-email-in" args=(hash model=model)}}
{{/if}}
{{/unless}}
+ {{#unless model.automatic}}
+ {{group-flair-inputs model=model}}
+ {{/unless}}
+
{{else}}
diff --git a/app/assets/javascripts/admin/templates/logs/screened-ip-addresses.hbs b/app/assets/javascripts/admin/templates/logs/screened-ip-addresses.hbs
new file mode 100644
index 00000000000..ca6c216f502
--- /dev/null
+++ b/app/assets/javascripts/admin/templates/logs/screened-ip-addresses.hbs
@@ -0,0 +1,79 @@
+{{i18n 'admin.logs.screened_ips.description'}}
+
+
+ {{text-field value=filter class="ip-address-input" placeholderKey="admin.logs.screened_ips.form.filter" autocorrect="off" autocapitalize="off"}}
+ {{d-button action="rollUp" title="admin.logs.screened_ips.roll_up.title" label="admin.logs.screened_ips.roll_up.text"}}
+ {{d-button action="exportScreenedIpList" icon="download" title="admin.export_csv.button_title.screened_ip" label="admin.export_csv.button_text"}}
+
+
+
+ {{screened-ip-address-form action="recordAdded"}}
+
+
+{{#conditional-loading-spinner condition=loading}}
+ {{#if model.length}}
+
+
+
+ {{i18n 'admin.logs.ip_address'}}
+ {{i18n 'admin.logs.action'}}
+ {{i18n 'admin.logs.match_count'}}
+ {{i18n 'admin.logs.last_match_at'}}
+ {{i18n 'admin.logs.created_at'}}
+
+
+
+
+ {{#each model as |item|}}
+
+
+ {{#if item.editing}}
+ {{text-field value=item.ip_address autofocus="autofocus"}}
+ {{else}}
+
+ {{#if item.isRange}}
+ {{item.ip_address}}
+ {{else}}
+ {{item.ip_address}}
+ {{/if}}
+
+ {{/if}}
+
+
+ {{#if item.isBlocked}}
+ {{fa-icon "ban"}}
+ {{else}}
+ {{fa-icon "check"}}
+ {{/if}}
+ {{item.actionName}}
+
+ {{item.match_count}}
+
+ {{#if item.last_match_at}}
+ {{age-with-tooltip item.last_match_at}}
+ {{/if}}
+
+ {{age-with-tooltip item.created_at}}
+
+ {{#unless item.editing}}
+ {{d-button action="destroy" actionParam=item icon="trash-o" class="btn-danger"}}
+ {{d-button action="edit" actionParam=item icon="pencil"}}
+ {{#if isBlocked}}
+ {{d-button action="allow" actionParam=item icon="check" label="admin.logs.screened_ips.actions.do_nothing"}}
+ {{else}}
+ {{d-button action="block" actionParam=item icon="ban" label="admin.logs.screened_ips.actions.block"}}
+ {{/if}}
+ {{else}}
+ {{d-button action="save" actionParam=item label="admin.logs.save"}}
+ {{i18n 'cancel'}}
+ {{/unless}}
+
+
+
+ {{/each}}
+
+
+ {{else}}
+ {{i18n 'search.no_results'}}
+ {{/if}}
+{{/conditional-loading-spinner}}
diff --git a/app/assets/javascripts/admin/templates/logs/screened_urls.hbs b/app/assets/javascripts/admin/templates/logs/screened-urls.hbs
similarity index 63%
rename from app/assets/javascripts/admin/templates/logs/screened_urls.hbs
rename to app/assets/javascripts/admin/templates/logs/screened-urls.hbs
index 68071cb32d6..40aaceba70d 100644
--- a/app/assets/javascripts/admin/templates/logs/screened_urls.hbs
+++ b/app/assets/javascripts/admin/templates/logs/screened-urls.hbs
@@ -16,7 +16,18 @@
- {{screened-urls-list content=model}}
+ {{#each model as |url|}}
+
+
+ {{url.domain}}
+
+ {{url.actionName}}
+ {{url.match_count}}
+ {{age-with-tooltip url.last_match_at}}
+ {{age-with-tooltip url.created_at}}
+
+
+ {{/each}}
{{else}}
{{i18n 'search.no_results'}}
diff --git a/app/assets/javascripts/admin/templates/logs/screened_emails_list_item.hbs b/app/assets/javascripts/admin/templates/logs/screened_emails_list_item.hbs
deleted file mode 100644
index 27cbf419854..00000000000
--- a/app/assets/javascripts/admin/templates/logs/screened_emails_list_item.hbs
+++ /dev/null
@@ -1,10 +0,0 @@
-
- {{email}}
-
-{{actionName}}
-{{match_count}}
-{{age-with-tooltip last_match_at}}
-{{age-with-tooltip created_at}}
-{{ip_address}}
-
-
diff --git a/app/assets/javascripts/admin/templates/logs/screened_ip_addresses.hbs b/app/assets/javascripts/admin/templates/logs/screened_ip_addresses.hbs
deleted file mode 100644
index 82e4f888889..00000000000
--- a/app/assets/javascripts/admin/templates/logs/screened_ip_addresses.hbs
+++ /dev/null
@@ -1,33 +0,0 @@
-{{i18n 'admin.logs.screened_ips.description'}}
-
-
- {{text-field value=filter class="ip-address-input" placeholderKey="admin.logs.screened_ips.form.filter" autocorrect="off" autocapitalize="off"}}
- {{d-button action="rollUp" title="admin.logs.screened_ips.roll_up.title" label="admin.logs.screened_ips.roll_up.text"}}
- {{d-button action="exportScreenedIpList" icon="download" title="admin.export_csv.button_title.screened_ip" label="admin.export_csv.button_text"}}
-
-
-
- {{screened-ip-address-form action="recordAdded"}}
-
-
-{{#conditional-loading-spinner condition=loading}}
- {{#if model.length}}
-
-
-
- {{i18n 'admin.logs.ip_address'}}
- {{i18n 'admin.logs.action'}}
- {{i18n 'admin.logs.match_count'}}
- {{i18n 'admin.logs.last_match_at'}}
- {{i18n 'admin.logs.created_at'}}
-
-
-
-
- {{screened-ip-addresses-list content=model}}
-
-
- {{else}}
- {{i18n 'search.no_results'}}
- {{/if}}
-{{/conditional-loading-spinner}}
diff --git a/app/assets/javascripts/admin/templates/logs/screened_ip_addresses_list_item.hbs b/app/assets/javascripts/admin/templates/logs/screened_ip_addresses_list_item.hbs
deleted file mode 100644
index 056b86f9e59..00000000000
--- a/app/assets/javascripts/admin/templates/logs/screened_ip_addresses_list_item.hbs
+++ /dev/null
@@ -1,43 +0,0 @@
-
- {{#if editing}}
- {{text-field value=ip_address autofocus="autofocus"}}
- {{else}}
-
- {{#if isRange}}
- {{ip_address}}
- {{else}}
- {{ip_address}}
- {{/if}}
-
- {{/if}}
-
-
- {{#if isBlocked}}
- {{fa-icon "ban"}}
- {{else}}
- {{fa-icon "check"}}
- {{/if}}
- {{actionName}}
-
-{{match_count}}
-
- {{#if last_match_at}}
- {{age-with-tooltip last_match_at}}
- {{/if}}
-
-{{age-with-tooltip created_at}}
-
- {{#unless editing}}
- {{d-button action="destroy" actionParam=this icon="trash-o" class="btn-danger"}}
- {{d-button action="edit" actionParam=this icon="pencil"}}
- {{#if isBlocked}}
- {{d-button action="allow" actionParam=this icon="check" label="admin.logs.screened_ips.actions.do_nothing"}}
- {{else}}
- {{d-button action="block" actionParam=this icon="ban" label="admin.logs.screened_ips.actions.block"}}
- {{/if}}
- {{else}}
- {{d-button action="save" actionParam=this label="admin.logs.save"}}
- {{i18n 'cancel'}}
- {{/unless}}
-
-
diff --git a/app/assets/javascripts/admin/templates/logs/screened_urls_list_item.hbs b/app/assets/javascripts/admin/templates/logs/screened_urls_list_item.hbs
deleted file mode 100644
index 234f2481296..00000000000
--- a/app/assets/javascripts/admin/templates/logs/screened_urls_list_item.hbs
+++ /dev/null
@@ -1,8 +0,0 @@
-
- {{domain}}
-
-{{actionName}}
-{{match_count}}
-{{age-with-tooltip last_match_at}}
-{{age-with-tooltip created_at}}
-
diff --git a/app/assets/javascripts/admin/templates/logs/staff_action_logs.hbs b/app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs
similarity index 57%
rename from app/assets/javascripts/admin/templates/logs/staff_action_logs.hbs
rename to app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs
index 4b2654eadd9..18a622f958a 100644
--- a/app/assets/javascripts/admin/templates/logs/staff_action_logs.hbs
+++ b/app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs
@@ -49,10 +49,39 @@
{{#conditional-loading-spinner condition=loading}}
- {{#if model.length}}
- {{staff-action-logs-list content=model}}
+ {{#each model as |item|}}
+
+
+ {{#link-to 'adminUser' item.acting_user}}{{avatar item.acting_user imageSize="tiny"}}{{/link-to}}
+ {{item.acting_user.username}}
+
+
+
+ {{#if item.target_user}}
+ {{#link-to 'adminUser' item.target_user}}{{avatar item.target_user imageSize="tiny"}}{{/link-to}}
+ {{item.target_user.username}}
+ {{/if}}
+ {{#if item.subject}}
+ {{item.subject}}
+ {{/if}}
+
+ {{age-with-tooltip item.created_at}}
+
+ {{{item.formattedDetails}}}
+ {{#if item.useCustomModalForDetails}}
+ {{i18n 'admin.logs.staff_actions.show'}}
+ {{/if}}
+ {{#if item.useModalForDetails}}
+ {{i18n 'admin.logs.staff_actions.show'}}
+ {{/if}}
+
+ {{item.context}}
+
+
{{else}}
{{i18n 'search.no_results'}}
- {{/if}}
+ {{/each}}
{{/conditional-loading-spinner}}
diff --git a/app/assets/javascripts/admin/templates/logs/staff_action_logs_list_item.hbs b/app/assets/javascripts/admin/templates/logs/staff_action_logs_list_item.hbs
deleted file mode 100644
index 266c1be7eb8..00000000000
--- a/app/assets/javascripts/admin/templates/logs/staff_action_logs_list_item.hbs
+++ /dev/null
@@ -1,28 +0,0 @@
-
- {{#link-to 'adminUser' acting_user}}{{avatar acting_user imageSize="tiny"}}{{/link-to}}
- {{acting_user.username}}
-
-
- {{actionName}}
-
-
- {{#if target_user}}
- {{#link-to 'adminUser' target_user}}{{avatar target_user imageSize="tiny"}}{{/link-to}}
- {{target_user.username}}
- {{/if}}
- {{#if subject}}
- {{subject}}
- {{/if}}
-
-{{age-with-tooltip created_at}}
-
- {{{formattedDetails}}}
- {{#if useCustomModalForDetails}}
- {{i18n 'admin.logs.staff_actions.show'}}
- {{/if}}
- {{#if useModalForDetails}}
- {{i18n 'admin.logs.staff_actions.show'}}
- {{/if}}
-
-{{context}}
-
diff --git a/app/assets/javascripts/admin/templates/modal/admin-agree-flag.hbs b/app/assets/javascripts/admin/templates/modal/admin-agree-flag.hbs
new file mode 100644
index 00000000000..6f845b22c80
--- /dev/null
+++ b/app/assets/javascripts/admin/templates/modal/admin-agree-flag.hbs
@@ -0,0 +1,13 @@
+{{#d-modal-body title="admin.flags.agree_flag_modal_title"}}
+ {{#if model.user_deleted}}
+
+ {{else}}
+ {{#unless model.postHidden}}
+
+ {{/unless}}
+ {{/if}}
+
+ {{#if model.canDeleteAsSpammer}}
+
+ {{/if}}
+{{/d-modal-body}}
diff --git a/app/assets/javascripts/admin/templates/modal/admin_badge_preview.hbs b/app/assets/javascripts/admin/templates/modal/admin-badge-preview.hbs
similarity index 92%
rename from app/assets/javascripts/admin/templates/modal/admin_badge_preview.hbs
rename to app/assets/javascripts/admin/templates/modal/admin-badge-preview.hbs
index 14a475f5c57..c22bd9d99d2 100644
--- a/app/assets/javascripts/admin/templates/modal/admin_badge_preview.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-badge-preview.hbs
@@ -1,4 +1,4 @@
-
+{{#d-modal-body title="admin.badges.preview.modal_title" class="badge-query-preview"}}
{{#if errors}}
{{i18n 'admin.badges.preview.sql_error_header'}}
@@ -46,4 +46,4 @@
{{/if}}
{{/if}}
-
+{{/d-modal-body}}
diff --git a/app/assets/javascripts/admin/templates/modal/admin-delete-flag.hbs b/app/assets/javascripts/admin/templates/modal/admin-delete-flag.hbs
new file mode 100644
index 00000000000..c2abeae36d7
--- /dev/null
+++ b/app/assets/javascripts/admin/templates/modal/admin-delete-flag.hbs
@@ -0,0 +1,7 @@
+{{#d-modal-body title="admin.flags.delete_flag_modal_title"}}
+
+
+ {{#if model.canDeleteAsSpammer}}
+
+ {{/if}}
+{{/d-modal-body}}
diff --git a/app/assets/javascripts/admin/templates/modal/admin_edit_badge_groupings.hbs b/app/assets/javascripts/admin/templates/modal/admin-edit-badge-groupings.hbs
similarity index 92%
rename from app/assets/javascripts/admin/templates/modal/admin_edit_badge_groupings.hbs
rename to app/assets/javascripts/admin/templates/modal/admin-edit-badge-groupings.hbs
index 9d8daad53d6..80eb0844b30 100644
--- a/app/assets/javascripts/admin/templates/modal/admin_edit_badge_groupings.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-edit-badge-groupings.hbs
@@ -1,4 +1,4 @@
-
+{{#d-modal-body title="admin.badges.badge_groupings.modal_title"}}
{{#each workingCopy as |wc|}}
@@ -20,7 +20,8 @@
-
+{{/d-modal-body}}
+
{{else}}
{{i18n 'search.no_results'}}
diff --git a/app/assets/javascripts/admin/templates/permalinks_list_item.hbs b/app/assets/javascripts/admin/templates/permalinks_list_item.hbs
deleted file mode 100644
index 2a143e07ed7..00000000000
--- a/app/assets/javascripts/admin/templates/permalinks_list_item.hbs
+++ /dev/null
@@ -1,23 +0,0 @@
-{{url}}
-
- {{#if topic_id}}
- {{topic_title}}
- {{/if}}
-
-
- {{#if post_id}}
- #{{post_number}} {{post_topic_title}}
- {{/if}}
-
-
- {{#if category_id}}
- {{category_name}}
- {{/if}}
-
-
- {{#if external_url}}
- {{external_url}}
- {{/if}}
-
-
-
diff --git a/app/assets/javascripts/admin/templates/plugins-index.hbs b/app/assets/javascripts/admin/templates/plugins-index.hbs
index 34bf63c756e..b7d64f2a346 100644
--- a/app/assets/javascripts/admin/templates/plugins-index.hbs
+++ b/app/assets/javascripts/admin/templates/plugins-index.hbs
@@ -1,4 +1,4 @@
-{{#if length}}
+{{#if model.length}}
{{#if currentUser.admin}}
{{d-button label="admin.plugins.change_settings"
diff --git a/app/assets/javascripts/admin/templates/site-settings-category.hbs b/app/assets/javascripts/admin/templates/site-settings-category.hbs
index 3e8b088f692..2e44f80c38c 100644
--- a/app/assets/javascripts/admin/templates/site-settings-category.hbs
+++ b/app/assets/javascripts/admin/templates/site-settings-category.hbs
@@ -1,9 +1,9 @@
{{#if filteredContent}}
-
+ {{#d-section class="form-horizontal settings"}}
{{#each filteredContent as |setting|}}
{{site-setting setting=setting saveAction="saveSetting"}}
{{/each}}
-
+ {{/d-section}}
{{else}}
{{i18n 'admin.site_settings.no_results'}}
diff --git a/app/assets/javascripts/admin/templates/user_badges.hbs b/app/assets/javascripts/admin/templates/user-badges.hbs
similarity index 100%
rename from app/assets/javascripts/admin/templates/user_badges.hbs
rename to app/assets/javascripts/admin/templates/user-badges.hbs
diff --git a/app/assets/javascripts/admin/templates/user-fields.hbs b/app/assets/javascripts/admin/templates/user-fields.hbs
index 3a89a0e06e9..72e4933052c 100644
--- a/app/assets/javascripts/admin/templates/user-fields.hbs
+++ b/app/assets/javascripts/admin/templates/user-fields.hbs
@@ -4,11 +4,11 @@
{{i18n 'admin.user_fields.help'}}
{{#if model}}
- {{#each arrangedContent as |uf|}}
+ {{#each sortedFields as |uf|}}
{{admin-user-field-item userField=uf
fieldTypes=fieldTypes
- firstField=arrangedContent.firstObject
- lastField=arrangedContent.lastObject
+ firstField=sortedFields.firstObject
+ lastField=sortedFields.lastObject
destroyAction="destroy"
moveUpAction="moveUp"
moveDownAction="moveDown"}}
diff --git a/app/assets/javascripts/admin/templates/user-index.hbs b/app/assets/javascripts/admin/templates/user-index.hbs
index 6c4c87afffc..9cc35a3dce3 100644
--- a/app/assets/javascripts/admin/templates/user-index.hbs
+++ b/app/assets/javascripts/admin/templates/user-index.hbs
@@ -9,16 +9,10 @@
{{/if}}
{{#if model.active}}
{{#if model.can_impersonate}}
-
+ {{d-button class="btn-danger" action="impersonate" icon="crosshairs" label="admin.impersonate.title" title="admin.impersonate.help"}}
{{/if}}
{{#if currentUser.admin}}
-
+ {{d-button action="logOut" icon="power-off" label="admin.user.log_out"}}
{{/if}}
{{/if}}
@@ -49,7 +43,7 @@
{{#if model.email}}
{{model.email}}
{{else}}
-
+ {{d-button action="checkEmail" actionParam=model icon="envelope-o" label="admin.users.check_email.text" title="admin.users.check_email.title"}}
{{/if}}
@@ -59,9 +53,7 @@
{{model.bounceScore}}
{{#if model.canResetBounceScore}}
-
+ {{d-button action="resetBounceScore" label="admin.user.reset_bounce_score.label" title="admin.user.reset_bounce_score.title"}}
{{/if}}
{{model.bounceScoreExplanation}}
@@ -73,7 +65,7 @@
{{#if model.associated_accounts}}
{{model.associated_accounts}}
{{else}}
-
+ {{d-button action="checkEmail" actionParam=model icon="envelope-o" label="admin.users.check_email.text" title="admin.users.check_email.title"}}
{{/if}}
@@ -108,9 +100,7 @@
{{model.ip_address}}
{{#if currentUser.staff}}
-
+ {{d-button action="refreshBrowsers" label="admin.user.refresh_browsers"}}
{{ip-lookup ip=model.ip_address userId=model.id}}
{{/if}}
@@ -176,10 +166,7 @@
{{i18n 'admin.user.approve_success'}}
{{else}}
{{#if model.can_approve}}
-
+ {{d-button action="approve" icon="check" label="admin.user.approve"}}
{{/if}}
{{/if}}
@@ -188,31 +175,19 @@
{{i18n 'admin.users.active'}}
-
- {{#if model.active}}
- {{i18n 'yes_value'}}
- {{else}}
- {{i18n 'no_value'}}
- {{/if}}
-
+ {{i18n-yes-no model.active}}
{{#if model.active}}
{{#if model.can_deactivate}}
-
+ {{d-button action="deactivate" label="admin.user.deactivate_account"}}
{{i18n 'admin.user.deactivate_explanation'}}
{{/if}}
{{else}}
{{#if model.can_send_activation_email}}
-
+ {{d-button action="sendActivationEmail" icon="envelope" label="admin.user.send_activation_email"}}
{{/if}}
{{#if model.can_activate}}
-
+ {{d-button action="activate" icon="check" label="admin.user.activate"}}
{{/if}}
{{/if}}
@@ -240,38 +215,26 @@
{{i18n 'admin.user.admin'}}
- {{model.admin}}
+ {{i18n-yes-no model.admin}}
{{#if model.can_revoke_admin}}
-
+ {{d-button action="revokeAdmin" icon="shield" label="admin.user.revoke_admin"}}
{{/if}}
{{#if model.can_grant_admin}}
-
+ {{d-button action="grantAdmin" icon="shield" label="admin.user.grant_admin"}}
{{/if}}
{{i18n 'admin.user.moderator'}}
- {{model.moderator}}
+ {{i18n-yes-no model.moderator}}
{{#if model.can_revoke_moderation}}
-
+ {{d-button action="revokeModeration" icon="shield" label="admin.user.revoke_moderation"}}
{{/if}}
{{#if model.can_grant_moderation}}
-
+ {{d-button action="grantModeration" icon="shield" label="admin.user.grant_moderation"}}
{{/if}}
@@ -282,17 +245,17 @@
{{combo-box content=site.trustLevels value=model.trust_level nameProperty="detailedName"}}
{{#if model.dirty}}
-
-
+ {{d-button class="ok no-text" action="saveTrustLevel" icon="check"}}
+ {{d-button class="cancel no-text" action="restoreTrustLevel" icon="times"}}
{{/if}}
{{#if model.canLockTrustLevel}}
{{#if model.trust_level_locked}}
-
+ {{d-button action="lockTrustLevel" actionParam=false label="admin.user.unlock_trust_level"}}
{{else}}
-
+ {{d-button action="lockTrustLevel" actionParam=true label="admin.user.lock_trust_level"}}
{{/if}}
{{/if}}
{{#if model.tl3Requirements}}
@@ -303,21 +266,15 @@
{{i18n 'admin.user.suspended'}}
- {{model.isSuspended}}
+ {{i18n-yes-no model.isSuspended}}
{{#if model.isSuspended}}
-
+ {{d-button class="btn-danger" action="unsuspend" icon="ban" label="admin.user.unsuspend"}}
{{suspendDuration}}
{{i18n 'admin.user.suspended_explanation'}}
{{else}}
{{#if model.canSuspend}}
-
+ {{d-button class="btn-danger" action="showSuspendModal" actionParam=model icon="ban" label="admin.user.suspend"}}
{{i18n 'admin.user.suspended_explanation'}}
{{/if}}
{{/if}}
@@ -340,20 +297,14 @@
{{i18n 'admin.user.blocked'}}
- {{model.blocked}}
+ {{i18n-yes-no model.blocked}}
{{#conditional-loading-spinner size="small" condition=model.blockingUser}}
{{#if model.blocked}}
-
+ {{d-button action="unblock" icon="thumbs-o-up" label="admin.user.unblock"}}
{{i18n 'admin.user.block_explanation'}}
{{else}}
-
+ {{d-button action="block" icon="ban" label="admin.user.block"}}
{{i18n 'admin.user.block_explanation'}}
{{/if}}
{{/conditional-loading-spinner}}
@@ -362,7 +313,7 @@
{{i18n 'admin.user.staged'}}
- {{model.staged}}
+ {{i18n-yes-no model.staged}}
{{i18n 'admin.user.staged_explanation'}}
@@ -423,10 +374,7 @@
{{#if model.can_delete_all_posts}}
{{#if model.post_count}}
-
+ {{d-button class="btn-danger" action="deleteAllPosts" icon="trash-o" label="admin.user.delete_all_posts"}}
{{/if}}
{{else}}
{{model.deleteAllPostsExplanation}}
diff --git a/app/assets/javascripts/admin/templates/user-tl3-requirements.hbs b/app/assets/javascripts/admin/templates/user-tl3-requirements.hbs
index a9b1cfdc8c7..e0536ddd087 100644
--- a/app/assets/javascripts/admin/templates/user-tl3-requirements.hbs
+++ b/app/assets/javascripts/admin/templates/user-tl3-requirements.hbs
@@ -10,7 +10,7 @@
{{model.username}} - {{i18n 'admin.user.tl3_requirements.title'}}
- {{i18n 'admin.user.tl3_requirements.table_title' time_period=model.tl3Requirements.time_period}}
+ {{i18n 'admin.user.tl3_requirements.table_title' count=model.tl3Requirements.time_period}}
diff --git a/app/assets/javascripts/admin/templates/user.hbs b/app/assets/javascripts/admin/templates/user.hbs
index c24cd68950a..3b1c7742714 100644
--- a/app/assets/javascripts/admin/templates/user.hbs
+++ b/app/assets/javascripts/admin/templates/user.hbs
@@ -1 +1,3 @@
-{{outlet}}
+{{#d-section}}
+ {{outlet}}
+{{/d-section}}
diff --git a/app/assets/javascripts/admin/templates/users_list.hbs b/app/assets/javascripts/admin/templates/users-list.hbs
similarity index 100%
rename from app/assets/javascripts/admin/templates/users_list.hbs
rename to app/assets/javascripts/admin/templates/users-list.hbs
diff --git a/app/assets/javascripts/admin/templates/version-checks.hbs b/app/assets/javascripts/admin/templates/version-checks.hbs
index 542020d8ebd..25c560ad6ae 100644
--- a/app/assets/javascripts/admin/templates/version-checks.hbs
+++ b/app/assets/javascripts/admin/templates/version-checks.hbs
@@ -1,7 +1,10 @@
+
+ {{custom-html name="upgrade-header" versionCheck=versionCheck tagName="thead"}}
+
+
- {{custom-html 'upgrade-header'}}
{{i18n 'admin.dashboard.installed_version'}}
diff --git a/app/assets/javascripts/admin/templates/web-hooks-show-events.hbs b/app/assets/javascripts/admin/templates/web-hooks-show-events.hbs
new file mode 100644
index 00000000000..f3b8825e5bf
--- /dev/null
+++ b/app/assets/javascripts/admin/templates/web-hooks-show-events.hbs
@@ -0,0 +1,40 @@
+
+ {{#link-to 'adminWebHooks' tagName='button' classNames='btn'}}
+ {{fa-icon 'list'}} {{i18n 'admin.web_hooks.events.go_list'}}
+ {{/link-to}}
+ {{d-button icon="send" label="admin.web_hooks.events.ping" action="ping" disabled=pingDisabled}}
+ {{#link-to 'adminWebHooks.show' model.extras.web_hook_id tagName='button' classNames='btn'}}
+ {{fa-icon 'edit'}} {{i18n 'admin.web_hooks.events.go_details'}}
+ {{/link-to}}
+
+
+
+{{#if model}}
+ {{#load-more selector=".web-hook-events li" action="loadMore"}}
+
+
+ {{i18n 'admin.web_hooks.events.status'}}
+ {{i18n 'admin.web_hooks.events.event_id'}}
+
+ {{i18n 'admin.web_hooks.events.completion'}}
+ {{i18n 'admin.web_hooks.events.actions'}}
+
+
+ {{#if hasIncoming}}
+
+ {{count-i18n key="admin.web_hooks.events.incoming" count=incomingCount}}
+ {{i18n 'click_to_show'}}
+
+ {{/if}}
+
+ {{#each model as |webHookEvent|}}
+ {{admin-web-hook-event model=webHookEvent}}
+ {{/each}}
+
+
+ {{conditional-loading-spinner condition=model.loadingMore}}
+ {{/load-more}}
+{{else}}
+ {{i18n 'admin.web_hooks.events.none'}}
+{{/if}}
+
diff --git a/app/assets/javascripts/admin/templates/web-hooks-show.hbs b/app/assets/javascripts/admin/templates/web-hooks-show.hbs
new file mode 100644
index 00000000000..b0e0c0c0bfb
--- /dev/null
+++ b/app/assets/javascripts/admin/templates/web-hooks-show.hbs
@@ -0,0 +1,86 @@
+{{#link-to 'adminWebHooks' class="go-back"}}
+ {{fa-icon 'arrow-left'}}
+ {{i18n 'admin.web_hooks.go_back'}}
+{{/link-to}}
+
+
+ {{i18n 'admin.web_hooks.detailed_instruction'}}
+
+
+
+
+ {{#unless model.isNew}}
+ {{d-button class="btn-danger" label="admin.web_hooks.destroy" action="destroy"}}
+ {{#link-to 'adminWebHooks.showEvents' model.id class="btn"}}
+ {{i18n 'admin.web_hooks.events.go_events'}}
+ {{/link-to}}
+ {{/unless}}
+ {{savingStatus}}
+
+
diff --git a/app/assets/javascripts/admin/templates/web-hooks.hbs b/app/assets/javascripts/admin/templates/web-hooks.hbs
new file mode 100644
index 00000000000..082cf170b41
--- /dev/null
+++ b/app/assets/javascripts/admin/templates/web-hooks.hbs
@@ -0,0 +1,39 @@
+
+ {{#link-to 'adminWebHooks.show' 'new' tagName='button' classNames='btn'}}
+ {{fa-icon 'plus'}} {{i18n 'admin.web_hooks.new'}}
+ {{/link-to}}
+
+
+
+{{#if model}}
+ {{i18n 'admin.web_hooks.instruction'}}
+ {{#load-more selector=".web-hooks tr" action="loadMore"}}
+
+
+
+ {{i18n 'admin.web_hooks.delivery_status.title'}}
+ {{i18n 'admin.web_hooks.payload_url'}}
+ {{i18n 'admin.web_hooks.description'}}
+ {{i18n 'admin.web_hooks.controls'}}
+
+
+
+ {{#each model as |webHook|}}
+
+ {{#link-to 'adminWebHooks.showEvents' webHook.id}}{{admin-web-hook-status deliveryStatuses=deliveryStatuses model=webHook}}{{/link-to}}
+ {{#link-to 'adminWebHooks.show' webHook}}{{webHook.payload_url}}{{/link-to}}
+ {{webHook.description}}
+
+ {{#link-to 'adminWebHooks.show' webHook tagName='button' classNames='btn btn-default no-text'}}{{fa-icon 'edit'}}{{/link-to}}
+ {{d-button class="destroy btn-danger" action='destroy' actionParam=webHook icon="remove"}}
+
+
+ {{/each}}
+
+
+ {{conditional-loading-spinner condition=model.loadingMore}}
+ {{/load-more}}
+{{else}}
+ {{i18n 'admin.web_hooks.none'}}
+{{/if}}
+
diff --git a/app/assets/javascripts/admin/views/admin-backups.js.es6 b/app/assets/javascripts/admin/views/admin-backups.js.es6
deleted file mode 100644
index a779f4971d2..00000000000
--- a/app/assets/javascripts/admin/views/admin-backups.js.es6
+++ /dev/null
@@ -1,25 +0,0 @@
-import DiscourseURL from 'discourse/lib/url';
-
-export default Ember.View.extend({
- classNames: ["admin-backups"],
-
- _hijackDownloads: function() {
- this.$().on("mouseup.admin-backups", "a.download", function (e) {
- var $link = $(e.currentTarget);
-
- if (!$link.data("href")) {
- $link.addClass("no-href");
- $link.data("href", $link.attr("href"));
- $link.attr("href", null);
- $link.data("auto-route", true);
- }
-
- DiscourseURL.redirectTo($link.data("href"));
- });
- }.on("didInsertElement"),
-
- _removeBindings: function() {
- this.$().off("mouseup.admin-backups");
- }.on("willDestroyElement")
-
-});
diff --git a/app/assets/javascripts/admin/views/admin-badges-index.js.es6 b/app/assets/javascripts/admin/views/admin-badges-index.js.es6
deleted file mode 100644
index f0b0ceb85d1..00000000000
--- a/app/assets/javascripts/admin/views/admin-badges-index.js.es6
+++ /dev/null
@@ -1,3 +0,0 @@
-import ScrollTop from 'discourse/mixins/scroll-top';
-
-export default Ember.View.extend(ScrollTop);
diff --git a/app/assets/javascripts/admin/views/admin-badges-show.js.es6 b/app/assets/javascripts/admin/views/admin-badges-show.js.es6
deleted file mode 100644
index 55f7e0b64d8..00000000000
--- a/app/assets/javascripts/admin/views/admin-badges-show.js.es6
+++ /dev/null
@@ -1,7 +0,0 @@
-import ScrollTop from 'discourse/mixins/scroll-top';
-
-export default Ember.View.extend(ScrollTop, {
- _scrollOnModelChange: function() {
- this._scrollTop();
- }.observes('controller.model.id')
-});
diff --git a/app/assets/javascripts/admin/views/admin-customize-colors.js.es6 b/app/assets/javascripts/admin/views/admin-customize-colors.js.es6
deleted file mode 100644
index ac5df78af58..00000000000
--- a/app/assets/javascripts/admin/views/admin-customize-colors.js.es6
+++ /dev/null
@@ -1,3 +0,0 @@
-export default Ember.View.extend({
- templateName: 'admin/templates/customize_colors'
-});
diff --git a/app/assets/javascripts/admin/views/admin-user.js.es6 b/app/assets/javascripts/admin/views/admin-user.js.es6
deleted file mode 100644
index 2bd2497f157..00000000000
--- a/app/assets/javascripts/admin/views/admin-user.js.es6
+++ /dev/null
@@ -1 +0,0 @@
-export default Ember.View.extend(Discourse.ScrollTop);
diff --git a/app/assets/javascripts/admin/views/modals/admin-agree-flag.js.es6 b/app/assets/javascripts/admin/views/modals/admin-agree-flag.js.es6
deleted file mode 100644
index 0a4aba513f9..00000000000
--- a/app/assets/javascripts/admin/views/modals/admin-agree-flag.js.es6
+++ /dev/null
@@ -1,6 +0,0 @@
-import ModalBodyView from "discourse/views/modal-body";
-
-export default ModalBodyView.extend({
- templateName: 'admin/templates/modal/admin_agree_flag',
- title: I18n.t('admin.flags.agree_flag_modal_title')
-});
diff --git a/app/assets/javascripts/admin/views/modals/admin-badge-preview.js.es6 b/app/assets/javascripts/admin/views/modals/admin-badge-preview.js.es6
deleted file mode 100644
index 6431ba9362b..00000000000
--- a/app/assets/javascripts/admin/views/modals/admin-badge-preview.js.es6
+++ /dev/null
@@ -1,6 +0,0 @@
-import ModalBodyView from "discourse/views/modal-body";
-
-export default ModalBodyView.extend({
- templateName: 'admin/templates/modal/admin_badge_preview',
- title: I18n.t('admin.badges.preview.modal_title')
-});
diff --git a/app/assets/javascripts/admin/views/modals/admin-delete-flag.js.es6 b/app/assets/javascripts/admin/views/modals/admin-delete-flag.js.es6
deleted file mode 100644
index 379b2ef773f..00000000000
--- a/app/assets/javascripts/admin/views/modals/admin-delete-flag.js.es6
+++ /dev/null
@@ -1,6 +0,0 @@
-import ModalBodyView from "discourse/views/modal-body";
-
-export default ModalBodyView.extend({
- templateName: 'admin/templates/modal/admin_delete_flag',
- title: I18n.t('admin.flags.delete_flag_modal_title')
-});
diff --git a/app/assets/javascripts/admin/views/modals/admin-edit-badge-groupings.js.es6 b/app/assets/javascripts/admin/views/modals/admin-edit-badge-groupings.js.es6
deleted file mode 100644
index ccc5f49a3b9..00000000000
--- a/app/assets/javascripts/admin/views/modals/admin-edit-badge-groupings.js.es6
+++ /dev/null
@@ -1,6 +0,0 @@
-import ModalBodyView from "discourse/views/modal-body";
-
-export default ModalBodyView.extend({
- templateName: 'admin/templates/modal/admin_edit_badge_groupings',
- title: I18n.t('admin.badges.badge_groupings.modal_title')
-});
diff --git a/app/assets/javascripts/admin/views/modals/admin-incoming-email.js.es6 b/app/assets/javascripts/admin/views/modals/admin-incoming-email.js.es6
deleted file mode 100644
index 576feff433c..00000000000
--- a/app/assets/javascripts/admin/views/modals/admin-incoming-email.js.es6
+++ /dev/null
@@ -1,7 +0,0 @@
-import ModalBodyView from "discourse/views/modal-body";
-
-export default ModalBodyView.extend({
- templateName: 'admin/templates/modal/admin_incoming_email',
- classNames: ['incoming-emails'],
- title: I18n.t('admin.email.incoming_emails.modal.title')
-});
diff --git a/app/assets/javascripts/admin/views/modals/admin-staff-action-log-details.js.es6 b/app/assets/javascripts/admin/views/modals/admin-staff-action-log-details.js.es6
deleted file mode 100644
index a31a61e0c9f..00000000000
--- a/app/assets/javascripts/admin/views/modals/admin-staff-action-log-details.js.es6
+++ /dev/null
@@ -1,6 +0,0 @@
-import ModalBodyView from "discourse/views/modal-body";
-
-export default ModalBodyView.extend({
- templateName: 'admin/templates/logs/details_modal',
- title: I18n.t('admin.logs.staff_actions.modal_title')
-});
diff --git a/app/assets/javascripts/admin/views/modals/admin-start-backup.js.es6 b/app/assets/javascripts/admin/views/modals/admin-start-backup.js.es6
deleted file mode 100644
index e363ee1a157..00000000000
--- a/app/assets/javascripts/admin/views/modals/admin-start-backup.js.es6
+++ /dev/null
@@ -1,6 +0,0 @@
-import ModalBodyView from "discourse/views/modal-body";
-
-export default ModalBodyView.extend({
- templateName: 'admin/templates/modal/admin_start_backup',
- title: I18n.t('admin.backups.operations.backup.confirm')
-});
diff --git a/app/assets/javascripts/admin/views/modals/admin-suspend-user.js.es6 b/app/assets/javascripts/admin/views/modals/admin-suspend-user.js.es6
deleted file mode 100644
index 9f3dcb1635e..00000000000
--- a/app/assets/javascripts/admin/views/modals/admin-suspend-user.js.es6
+++ /dev/null
@@ -1,6 +0,0 @@
-import ModalBodyView from "discourse/views/modal-body";
-
-export default ModalBodyView.extend({
- templateName: 'admin/templates/modal/admin_suspend_user',
- title: I18n.t('admin.user.suspend_modal_title')
-});
diff --git a/app/assets/javascripts/admin/views/modals/change-site-customization-details.js.es6 b/app/assets/javascripts/admin/views/modals/change-site-customization-details.js.es6
deleted file mode 100644
index 28cc323e48e..00000000000
--- a/app/assets/javascripts/admin/views/modals/change-site-customization-details.js.es6
+++ /dev/null
@@ -1,6 +0,0 @@
-import ModalBodyView from "discourse/views/modal-body";
-
-export default ModalBodyView.extend({
- templateName: 'admin/templates/logs/site_customization_change_modal',
- title: I18n.t('admin.logs.staff_actions.modal_title')
-});
diff --git a/app/assets/javascripts/admin/views/modals/delete-site-customization-details.js.es6 b/app/assets/javascripts/admin/views/modals/delete-site-customization-details.js.es6
deleted file mode 100644
index 28cc323e48e..00000000000
--- a/app/assets/javascripts/admin/views/modals/delete-site-customization-details.js.es6
+++ /dev/null
@@ -1,6 +0,0 @@
-import ModalBodyView from "discourse/views/modal-body";
-
-export default ModalBodyView.extend({
- templateName: 'admin/templates/logs/site_customization_change_modal',
- title: I18n.t('admin.logs.staff_actions.modal_title')
-});
diff --git a/app/assets/javascripts/main_include.js b/app/assets/javascripts/application.js
similarity index 87%
rename from app/assets/javascripts/main_include.js
rename to app/assets/javascripts/application.js
index dcd876d9ce7..96a2066c414 100644
--- a/app/assets/javascripts/main_include.js
+++ b/app/assets/javascripts/application.js
@@ -2,6 +2,8 @@
//= require ./ember-addons/decorator-alias
//= require ./ember-addons/macro-alias
//= require ./ember-addons/ember-computed-decorators
+//= require ./ember-addons/fmt
+//= require_tree ./discourse-common
//= require ./discourse
//= require ./deprecated
@@ -19,15 +21,11 @@
//= require ./discourse/lib/debounce
//= require ./discourse/lib/quote
//= require ./discourse/lib/key-value-store
-//= require ./discourse/lib/helpers
-//= require ./discourse/helpers/i18n
-//= require ./discourse/helpers/fa-icon
-//= require ./discourse/lib/raw-handlebars
-//= require ./discourse/lib/helpers
//= require ./discourse/lib/computed
//= require ./discourse/lib/formatter
//= require ./discourse/lib/eyeline
//= require ./discourse/mixins/scrolling
+//= require ./discourse/mixins/scrolling
//= require ./discourse/models/model
//= require ./discourse/models/rest
//= require ./discourse/models/badge-grouping
@@ -61,12 +59,7 @@
//= require ./discourse/models/user-badge
//= require ./discourse/controllers/discovery-sortable
//= require ./discourse/controllers/navigation/default
-//= require ./discourse/views/container
-//= require ./discourse/views/modal-body
-//= require ./discourse/views/flag
-//= require ./discourse/components/combo-box
//= require ./discourse/components/edit-category-panel
-//= require ./discourse/views/button
//= require ./discourse/components/dropdown-button
//= require ./discourse/components/notifications-button
//= require ./discourse/lib/link-mentions
@@ -74,7 +67,6 @@
//= require ./discourse/lib/emoji/groups
//= require ./discourse/lib/emoji/toolbar
//= require ./discourse/components/d-editor
-//= require ./discourse/views/composer
//= require ./discourse/lib/show-modal
//= require ./discourse/lib/screen-track
//= require ./discourse/routes/discourse
@@ -84,7 +76,6 @@
//= require ./discourse/routes/user-activity-stream
//= require ./discourse/routes/topic-from-params
//= require ./discourse/components/text-field
-//= require ./discourse/components/visible
//= require ./discourse/components/conditional-loading-spinner
//= require ./discourse/helpers/user-avatar
//= require ./discourse/helpers/cold-age-class
@@ -92,12 +83,12 @@
//= require ./discourse/helpers/category-link
//= require ./discourse/lib/export-result
//= require_tree ./discourse/lib
-//= require ./discourse/router
+//= require ./discourse/mapping-router
//= require_tree ./discourse/controllers
//= require_tree ./discourse/models
//= require_tree ./discourse/components
-//= require_tree ./discourse/views
+//= require_tree ./discourse/raw-views
//= require_tree ./discourse/helpers
//= require_tree ./discourse/templates
//= require_tree ./discourse/routes
diff --git a/app/assets/javascripts/application.js.erb b/app/assets/javascripts/application.js.erb
deleted file mode 100644
index 4b040e3bd65..00000000000
--- a/app/assets/javascripts/application.js.erb
+++ /dev/null
@@ -1,17 +0,0 @@
-<%
-
-require_asset ("./main_include.js")
-
-# Include plugin javascripts/handlebars templates
-DiscoursePluginRegistry.javascripts.each { |js| require_asset(js) }
-DiscoursePluginRegistry.handlebars.each { |hb| require_asset(hb) }
-
-DiscoursePluginRegistry.each_globbed_asset do |f, ext|
- if File.directory?(f)
- depend_on(f)
- elsif f.to_s.end_with?(".#{ext}")
- require_asset(f)
- end
-end
-
-%>
diff --git a/app/assets/javascripts/deprecated.js b/app/assets/javascripts/deprecated.js
index 5f8a06d597c..151ed975d0c 100644
--- a/app/assets/javascripts/deprecated.js
+++ b/app/assets/javascripts/deprecated.js
@@ -1,31 +1,7 @@
(function() {
var Discourse = require('discourse').default;
- function deprecate(module, methods) {
- const result = {};
-
- methods.forEach(function(m) {
- result[m] = function() {
- Ember.warn("Discourse." + module + "." + m + " is deprecated. Export a setup() function instead");
- };
- });
-
- Discourse[module] = result;
- }
-
- deprecate('Markdown', ['whiteListTag', 'whiteListIframe']);
- deprecate('Dialect', ['inlineRegexp', 'inlineBetween', 'addPreProcessor', 'replaceBlock',
- 'inlineReplace', 'registerInline', 'registerEmoji']);
-
- deprecate('BBCode', ['replaceBBCode', 'register', 'rawBBCode', 'replaceBBCodeParamsRaw']);
-
Discourse.dialect_deprecated = true;
- Discourse.ajax = function() {
- var ajax = require('discourse/lib/ajax').ajax;
- Ember.warn("Discourse.ajax is deprecated. Import the module and use it instead");
- return ajax.apply(this, arguments);
- };
-
window.Discourse = Discourse;
})();
diff --git a/app/assets/javascripts/discourse/components/combo-box.js.es6 b/app/assets/javascripts/discourse-common/components/combo-box.js.es6
similarity index 81%
rename from app/assets/javascripts/discourse/components/combo-box.js.es6
rename to app/assets/javascripts/discourse-common/components/combo-box.js.es6
index 5caf1adea9a..2a2c4e2ba77 100644
--- a/app/assets/javascripts/discourse/components/combo-box.js.es6
+++ b/app/assets/javascripts/discourse-common/components/combo-box.js.es6
@@ -1,13 +1,14 @@
+import { bufferedRender } from 'discourse-common/lib/buffered-render';
import { on, observes } from 'ember-addons/ember-computed-decorators';
-export default Ember.Component.extend({
+export default Ember.Component.extend(bufferedRender({
tagName: 'select',
attributeBindings: ['tabindex', 'disabled'],
classNames: ['combobox'],
valueAttribute: 'id',
nameProperty: 'name',
- render(buffer) {
+ buildBuffer(buffer) {
const nameProperty = this.get('nameProperty');
const none = this.get('none');
@@ -48,11 +49,11 @@ export default Ember.Component.extend({
@observes('content.[]')
_rerenderOnChange() {
- this.rerender();
+ this.rerenderBuffer();
},
- @on('didInsertElement')
- _initializeCombo() {
+ didInsertElement() {
+ this._super();
// Workaround for https://github.com/emberjs/ember.js/issues/9813
// Can be removed when fixed. Without it, the wrong option is selected
@@ -60,14 +61,15 @@ export default Ember.Component.extend({
// observer for item names changing (optional)
if (this.get('nameChanges')) {
- this.addObserver('content.@each.' + this.get('nameProperty'), this.rerender);
+ this.addObserver('content.@each.' + this.get('nameProperty'), this.rerenderBuffer);
}
const $elem = this.$();
- const minimumResultsForSearch = this.capabilities.isIOS ? -1 : 5;
+ const caps = this.capabilities;
+ const minimumResultsForSearch = (caps && caps.isIOS) ? -1 : 5;
$elem.select2({
formatResult: this.comboTemplate, minimumResultsForSearch,
- width: 'resolve',
+ width: this.get('width') || 'resolve',
allowClear: true
});
@@ -79,7 +81,11 @@ export default Ember.Component.extend({
}
this.set('value', val);
});
- $elem.trigger('change');
+ Ember.run.scheduleOnce('afterRender', this, this._triggerChange);
+ },
+
+ _triggerChange() {
+ this.$().trigger('change');
},
@on('willDestroyElement')
@@ -87,4 +93,4 @@ export default Ember.Component.extend({
this.$().select2('destroy');
}
-});
+}));
diff --git a/app/assets/javascripts/discourse-common/helpers/bound-i18n.js.es6 b/app/assets/javascripts/discourse-common/helpers/bound-i18n.js.es6
new file mode 100644
index 00000000000..d507efd5ec8
--- /dev/null
+++ b/app/assets/javascripts/discourse-common/helpers/bound-i18n.js.es6
@@ -0,0 +1,3 @@
+import { htmlHelper } from 'discourse-common/lib/helpers';
+
+export default htmlHelper((key, params) => I18n.t(key, params.hash));
diff --git a/app/assets/javascripts/discourse/helpers/fa-icon.js.es6 b/app/assets/javascripts/discourse-common/helpers/fa-icon.js.es6
similarity index 54%
rename from app/assets/javascripts/discourse/helpers/fa-icon.js.es6
rename to app/assets/javascripts/discourse-common/helpers/fa-icon.js.es6
index 043c6a50e66..3c1f8b9b5ab 100644
--- a/app/assets/javascripts/discourse/helpers/fa-icon.js.es6
+++ b/app/assets/javascripts/discourse-common/helpers/fa-icon.js.es6
@@ -1,8 +1,7 @@
-import { h } from 'virtual-dom';
-import { registerUnbound } from 'discourse/lib/helpers';
+import { registerUnbound } from 'discourse-common/lib/helpers';
-function iconClasses(icon, params) {
- var classes = "fa fa-" + icon;
+export function iconClasses(icon, params) {
+ let classes = "fa fa-" + icon;
if (params.modifier) { classes += " fa-" + params.modifier; }
if (params['class']) { classes += ' ' + params['class']; }
return classes;
@@ -21,23 +20,6 @@ export function iconHTML(icon, params) {
return html;
}
-export function iconNode(icon, params) {
- params = params || {};
-
- const properties = {
- className: iconClasses(icon, params),
- attributes: { "aria-hidden": true }
- };
-
- if (params.title) { properties.attributes.title = params.title; }
-
- if (params.label) {
- return h('i', properties, h('span.sr-only', I18n.t(params.label)));
- } else {
- return h('i', properties);
- }
-}
-
registerUnbound('fa-icon', function(icon, params) {
return new Handlebars.SafeString(iconHTML(icon, params));
});
diff --git a/app/assets/javascripts/discourse-common/helpers/i18n.js.es6 b/app/assets/javascripts/discourse-common/helpers/i18n.js.es6
new file mode 100644
index 00000000000..40fd2893d52
--- /dev/null
+++ b/app/assets/javascripts/discourse-common/helpers/i18n.js.es6
@@ -0,0 +1,4 @@
+import { registerUnbound } from 'discourse-common/lib/helpers';
+
+registerUnbound('i18n', (key, params) => I18n.t(key, params));
+registerUnbound('i18n-yes-no', (value, params) => I18n.t(value ? 'yes_value' : 'no_value', params));
diff --git a/app/assets/javascripts/discourse-common/lib/buffered-render.js.es6 b/app/assets/javascripts/discourse-common/lib/buffered-render.js.es6
new file mode 100644
index 00000000000..6f19de49124
--- /dev/null
+++ b/app/assets/javascripts/discourse-common/lib/buffered-render.js.es6
@@ -0,0 +1,42 @@
+// Ember 2.0 removes buffered rendering, but we can still implement it ourselves.
+// In the long term we'll want to remove this.
+
+const Mixin = {
+ _customRender() {
+ if (!this.element || this.isDestroying || this.isDestroyed) { return; }
+
+ const buffer = [];
+ this.buildBuffer(buffer);
+ this.element.innerHTML = buffer.join('');
+ },
+
+ rerenderBuffer() {
+ Ember.run.scheduleOnce('render', this, this._customRender);
+ }
+};
+
+export function bufferedRender(obj) {
+
+ if (!obj.buildBuffer) {
+ Ember.warn('Missing `buildBuffer` method');
+ return obj;
+ }
+
+ const caller = { };
+
+ caller.didRender = function() {
+ this._super();
+ this._customRender();
+ };
+
+ const triggers = obj.rerenderTriggers;
+ if (triggers) {
+ caller.init = function() {
+ this._super();
+ triggers.forEach(k => this.addObserver(k, this.rerenderBuffer));
+ };
+ }
+ delete obj.rerenderTriggers;
+
+ return Ember.Mixin.create(Mixin, caller, obj);
+}
diff --git a/app/assets/javascripts/discourse-common/lib/get-url.js.es6 b/app/assets/javascripts/discourse-common/lib/get-url.js.es6
new file mode 100644
index 00000000000..0bbc6f00fd4
--- /dev/null
+++ b/app/assets/javascripts/discourse-common/lib/get-url.js.es6
@@ -0,0 +1,20 @@
+let baseUri;
+
+export default function getURL(url) {
+ if (!url) return url;
+
+ if (!baseUri) {
+ baseUri = $('meta[name="discourse-base-uri"]').attr('content') || '';
+ }
+
+ // if it's a non relative URL, return it.
+ if (url !== '/' && !/^\/[^\/]/.test(url)) return url;
+
+ const found = url.indexOf(baseUri);
+
+ if (found >= 0 && found < 3) return url;
+ if (url[0] !== "/") url = "/" + url;
+
+ return baseUri + url;
+}
+
diff --git a/app/assets/javascripts/discourse/lib/helpers.js.es6 b/app/assets/javascripts/discourse-common/lib/helpers.js.es6
similarity index 57%
rename from app/assets/javascripts/discourse/lib/helpers.js.es6
rename to app/assets/javascripts/discourse-common/lib/helpers.js.es6
index 9eccf5651ca..33d64fc2e7c 100644
--- a/app/assets/javascripts/discourse/lib/helpers.js.es6
+++ b/app/assets/javascripts/discourse-common/lib/helpers.js.es6
@@ -1,20 +1,26 @@
-import { get } from 'discourse/lib/raw-handlebars';
+import { get } from 'discourse-common/lib/raw-handlebars';
-// `Ember.Helper` is only available in versions after 1.12
export function htmlHelper(fn) {
- if (Ember.Helper) {
- return Ember.Helper.helper(function() {
- return new Handlebars.SafeString(fn.apply(this, Array.prototype.slice.call(arguments)) || '');
- });
- } else {
- return Ember.Handlebars.makeBoundHelper(function() {
- return new Handlebars.SafeString(fn.apply(this, Array.prototype.slice.call(arguments)) || '');
- });
- }
+ return Ember.Helper.helper(function(...args) {
+ args = (args.length > 1) ? args[0].concat({ hash: args[args.length-1] }) : args;
+ return new Handlebars.SafeString(fn.apply(this, args) || '');
+ });
}
+const _helpers = {};
+
export function registerHelper(name, fn) {
- Ember.HTMLBars._registerHelper(name, fn);
+ _helpers[name] = Ember.Helper.helper(fn);
+}
+
+export function findHelper(name) {
+ return _helpers[name] || _helpers[name.dasherize()];
+}
+
+export function registerHelpers(registry) {
+ Object.keys(_helpers).forEach(name => {
+ registry.register(`helper:${name}`, _helpers[name], { singleton: false });
+ });
}
function resolveParams(ctx, options) {
@@ -39,6 +45,7 @@ function resolveParams(ctx, options) {
}
export function registerUnbound(name, fn) {
+
const func = function(property, options) {
if (options.types && (options.types[0] === "ID" || options.types[0] === "PathExpression")) {
property = get(this, property, options);
@@ -47,6 +54,8 @@ export function registerUnbound(name, fn) {
return fn.call(this, property, resolveParams(this, options));
};
+ _helpers[name] = Ember.Helper.extend({
+ compute: (params, args) => fn(params[0], args)
+ });
Handlebars.registerHelper(name, func);
- Ember.Handlebars.registerHelper(name, func);
}
diff --git a/app/assets/javascripts/discourse/lib/raw-handlebars.js.es6 b/app/assets/javascripts/discourse-common/lib/raw-handlebars.js.es6
similarity index 98%
rename from app/assets/javascripts/discourse/lib/raw-handlebars.js.es6
rename to app/assets/javascripts/discourse-common/lib/raw-handlebars.js.es6
index 423d8e88352..4b547a68828 100644
--- a/app/assets/javascripts/discourse/lib/raw-handlebars.js.es6
+++ b/app/assets/javascripts/discourse-common/lib/raw-handlebars.js.es6
@@ -18,6 +18,10 @@ RawHandlebars.helpers['get'] = function(context, options) {
var firstContext = options.contexts[0];
var val = firstContext[context];
+ if (context.indexOf('controller') === 0) {
+ context = context.replace(/^controller\./, '');
+ }
+
if (val && val.isDescriptor) { return Em.get(firstContext, context); }
val = val === undefined ? Em.get(firstContext, context): val;
return val;
diff --git a/app/assets/javascripts/discourse-common/resolver.js.es6 b/app/assets/javascripts/discourse-common/resolver.js.es6
new file mode 100644
index 00000000000..19247192086
--- /dev/null
+++ b/app/assets/javascripts/discourse-common/resolver.js.es6
@@ -0,0 +1,221 @@
+import { findHelper } from 'discourse-common/lib/helpers';
+
+/* global requirejs, require */
+var classify = Ember.String.classify;
+var get = Ember.get;
+
+const _options = {};
+
+export function setResolverOption(name, value) {
+ _options[name] = value;
+}
+
+export function getResolverOption(name) {
+ return _options[name];
+}
+
+function parseName(fullName) {
+ const nameParts = fullName.split(":");
+ const type = nameParts[0];
+ let fullNameWithoutType = nameParts[1];
+ const namespace = get(this, 'namespace');
+ const root = namespace;
+
+ return {
+ fullName,
+ type,
+ fullNameWithoutType,
+ name: fullNameWithoutType,
+ root,
+ resolveMethodName: "resolve" + classify(type)
+ };
+}
+
+export function buildResolver(baseName) {
+ return Ember.DefaultResolver.extend({
+ parseName,
+
+ resolveRouter(parsedName) {
+ const routerPath = `${baseName}/router`;
+ if (requirejs.entries[routerPath]) {
+ const module = require(routerPath, null, null, true);
+ return module.default;
+ }
+ return this._super(parsedName);
+ },
+
+ normalize(fullName) {
+ const split = fullName.split(':');
+ if (split.length > 1) {
+ const appBase = `${baseName}/${split[0]}s/`;
+ const adminBase = 'admin/' + split[0] + 's/';
+
+ // Allow render 'admin/templates/xyz' too
+ split[1] = split[1].replace('.templates', '').replace('/templates', '');
+
+ // Try slashes
+ let dashed = Ember.String.dasherize(split[1].replace(/\./g, '/'));
+ if (requirejs.entries[appBase + dashed] || requirejs.entries[adminBase + dashed]) {
+ return split[0] + ":" + dashed;
+ }
+
+ // Try with dashes instead of slashes
+ dashed = Ember.String.dasherize(split[1].replace(/\./g, '-'));
+ if (requirejs.entries[appBase + dashed] || requirejs.entries[adminBase + dashed]) {
+ return split[0] + ":" + dashed;
+ }
+ }
+ return this._super(fullName);
+ },
+
+ customResolve(parsedName) {
+ // If we end with the name we want, use it. This allows us to define components within plugins.
+ const suffix = parsedName.type + 's/' + parsedName.fullNameWithoutType,
+ dashed = Ember.String.dasherize(suffix),
+ moduleName = Object.keys(requirejs.entries).find(function(e) {
+ return (e.indexOf(suffix, e.length - suffix.length) !== -1) ||
+ (e.indexOf(dashed, e.length - dashed.length) !== -1);
+ });
+
+ var module;
+ if (moduleName) {
+ module = require(moduleName, null, null, true /* force sync */);
+ if (module && module['default']) { module = module['default']; }
+ }
+ return module;
+ },
+
+ resolveWidget(parsedName) {
+ return this.customResolve(parsedName) || this._super(parsedName);
+ },
+
+ resolveAdapter(parsedName) {
+ return this.customResolve(parsedName) || this._super(parsedName);
+ },
+
+ resolveModel(parsedName) {
+ return this.customResolve(parsedName) || this._super(parsedName);
+ },
+
+ resolveView(parsedName) {
+ return this.customResolve(parsedName) || this._super(parsedName);
+ },
+
+ resolveHelper(parsedName) {
+ return findHelper(parsedName.fullNameWithoutType) ||
+ this.customResolve(parsedName) ||
+ this._super(parsedName);
+ },
+
+ resolveController(parsedName) {
+ return this.customResolve(parsedName) || this._super(parsedName);
+ },
+
+ resolveComponent(parsedName) {
+ return this.customResolve(parsedName) || this._super(parsedName);
+ },
+
+ resolveService(parsedName) {
+ return this.customResolve(parsedName) || this._super(parsedName);
+ },
+
+ resolveRoute(parsedName) {
+ return this.customResolve(parsedName) || this._super(parsedName);
+ },
+
+ findLoadingTemplate(parsedName) {
+ if (parsedName.fullNameWithoutType.match(/loading$/)) {
+ return Ember.TEMPLATES.loading;
+ }
+ },
+
+ findConnectorTemplate(parsedName) {
+ const full = parsedName.fullNameWithoutType.replace('components/', '');
+ if (full.indexOf('connectors') === 0) {
+ return Ember.TEMPLATES[`javascripts/${full}`];
+ }
+
+ },
+
+ resolveTemplate(parsedName) {
+ return this.findPluginMobileTemplate(parsedName) ||
+ this.findPluginTemplate(parsedName) ||
+ this.findMobileTemplate(parsedName) ||
+ this.findTemplate(parsedName) ||
+ this.findLoadingTemplate(parsedName) ||
+ this.findConnectorTemplate(parsedName) ||
+ Ember.TEMPLATES.not_found;
+ },
+
+ findPluginTemplate(parsedName) {
+ const pluginParsedName = this.parseName(parsedName.fullName.replace("template:", "template:javascripts/"));
+ return this.findTemplate(pluginParsedName);
+ },
+
+ findPluginMobileTemplate(parsedName) {
+ if (_options.mobileView) {
+ var pluginParsedName = this.parseName(parsedName.fullName.replace("template:", "template:javascripts/mobile/"));
+ return this.findTemplate(pluginParsedName);
+ }
+ },
+
+ findMobileTemplate(parsedName) {
+ if (_options.mobileView) {
+ var mobileParsedName = this.parseName(parsedName.fullName.replace("template:", "template:mobile/"));
+ return this.findTemplate(mobileParsedName);
+ }
+ },
+
+ findTemplate(parsedName) {
+ const withoutType = parsedName.fullNameWithoutType,
+ slashedType = withoutType.replace(/\./g, '/'),
+ decamelized = withoutType.decamelize(),
+ dashed = decamelized.replace(/\./g, '-').replace(/\_/g, '-'),
+ templates = Ember.TEMPLATES;
+
+ return this._super(parsedName) ||
+ templates[slashedType] ||
+ templates[withoutType] ||
+ templates[withoutType.replace(/\.raw$/, '')] ||
+ templates[dashed] ||
+ templates[decamelized.replace(/\./, '/')] ||
+ templates[decamelized.replace(/\_/, '/')] ||
+ templates[`${baseName}/templates/${withoutType}`] ||
+ this.findAdminTemplate(parsedName) ||
+ this.findUnderscoredTemplate(parsedName);
+ },
+
+ findUnderscoredTemplate(parsedName) {
+ var decamelized = parsedName.fullNameWithoutType.decamelize();
+ var underscored = decamelized.replace(/\-/g, "_");
+ return Ember.TEMPLATES[underscored];
+ },
+
+ // Try to find a template within a special admin namespace, e.g. adminEmail => admin/templates/email
+ // (similar to how discourse lays out templates)
+ findAdminTemplate(parsedName) {
+ var decamelized = parsedName.fullNameWithoutType.decamelize();
+
+ if (decamelized.indexOf('components') === 0) {
+ const compTemplate = Ember.TEMPLATES['admin/templates/' + decamelized];
+ if (compTemplate) { return compTemplate; }
+ }
+
+ if (decamelized === "javascripts/admin") {
+ return Ember.TEMPLATES['admin/templates/admin'];
+ }
+
+ if (decamelized.indexOf('admin') === 0 || decamelized.indexOf('javascripts/admin') === 0) {
+ decamelized = decamelized.replace(/^admin\_/, 'admin/templates/');
+ decamelized = decamelized.replace(/^admin\./, 'admin/templates/');
+ decamelized = decamelized.replace(/\./g, '_');
+
+ const dashed = decamelized.replace(/_/g, '-');
+ return Ember.TEMPLATES[decamelized] ||
+ Ember.TEMPLATES[dashed] ||
+ Ember.TEMPLATES[dashed.replace('admin-', 'admin/')];
+ }
+ }
+
+ });
+}
diff --git a/vendor/assets/javascripts/loader.js b/app/assets/javascripts/discourse-loader.js
similarity index 81%
rename from vendor/assets/javascripts/loader.js
rename to app/assets/javascripts/discourse-loader.js
index 61f4a1c767f..2d9f1d9f35f 100644
--- a/vendor/assets/javascripts/loader.js
+++ b/app/assets/javascripts/discourse-loader.js
@@ -1,7 +1,15 @@
-var define, requireModule, require, requirejs;
+var define, require, requirejs;
(function() {
+ var MOVED_MODULES = {
+ "discourse/views/list/post-count-or-badges": "discourse/raw-views/list/post-count-or-badges",
+ "discourse/views/list/posts-count-column" : "discourse/raw-views/list/posts-count-column",
+ "discourse/views/list/visited-line" : "discourse/raw-views/list/visited-line",
+ "discourse/views/topic-list-header-column" : "discourse/raw-views/topic-list-header-column",
+ "discourse/views/topic-status" : "discourse/raw-views/topic-status"
+ };
+
var _isArray;
if (!Array.isArray) {
_isArray = function (x) {
@@ -48,7 +56,7 @@ var define, requireModule, require, requirejs;
return this._require || (this._require = function(dep) {
return require(resolve(dep, name));
});
- }
+ };
define = function(name, deps, callback) {
if (arguments.length < 2) {
@@ -76,7 +84,7 @@ var define, requireModule, require, requirejs;
return new Alias(path);
};
- function reify(mod, name, seen) {
+ function reify(mod, name, rseen) {
var deps = mod.deps;
var length = deps.length;
var reified = new Array(length);
@@ -88,11 +96,11 @@ var define, requireModule, require, requirejs;
for (var i = 0, l = length; i < l; i++) {
dep = deps[i];
if (dep === 'exports') {
- module.exports = reified[i] = seen;
+ module.exports = reified[i] = rseen;
} else if (dep === 'require') {
reified[i] = mod.makeRequire();
} else if (dep === 'module') {
- mod.exports = seen;
+ mod.exports = rseen;
module = reified[i] = mod;
} else {
reified[i] = requireFrom(resolve(dep, name), name);
@@ -106,7 +114,16 @@ var define, requireModule, require, requirejs;
}
function requireFrom(name, origin) {
+
var mod = registry[name];
+ if (!mod) {
+ var moved = MOVED_MODULES[name];
+ if (moved) {
+ console.warn("DEPRECATION: `" + name + "` was moved to `" + moved + "`");
+ }
+ mod = registry[moved];
+ }
+
if (!mod) {
throw new Error('Could not find module `' + name + '` imported from `' + origin + '`');
}
@@ -116,9 +133,14 @@ var define, requireModule, require, requirejs;
function missingModule(name) {
throw new Error('Could not find module ' + name);
}
- requirejs = require = requireModule = function(name) {
- var mod = registry[name];
+ requirejs = require = function(name) {
+
+ if (MOVED_MODULES[name]) {
+ name = MOVED_MODULES[name];
+ }
+
+ var mod = registry[name];
if (mod && mod.callback instanceof Alias) {
mod = registry[mod.callback.name];
@@ -162,6 +184,7 @@ var define, requireModule, require, requirejs;
return (seen[name] = obj);
};
+ window.requireModule = requirejs;
function resolve(child, name) {
if (child.charAt(0) !== '.') { return child; }
@@ -189,6 +212,6 @@ var define, requireModule, require, requirejs;
requirejs.entries = requirejs._eak_seen = registry;
requirejs.clear = function() {
requirejs.entries = requirejs._eak_seen = registry = {};
- seen = state = {};
+ seen = {};
};
})();
diff --git a/app/assets/javascripts/discourse-objects.js b/app/assets/javascripts/discourse-objects.js
new file mode 100644
index 00000000000..d55626ef029
--- /dev/null
+++ b/app/assets/javascripts/discourse-objects.js
@@ -0,0 +1,2 @@
+window.Discourse = {};
+Discourse.SiteSettings = {};
diff --git a/app/assets/javascripts/discourse.js.es6 b/app/assets/javascripts/discourse.js.es6
index 23c233c7c4f..5ca85473c5b 100644
--- a/app/assets/javascripts/discourse.js.es6
+++ b/app/assets/javascripts/discourse.js.es6
@@ -1,4 +1,4 @@
-import DiscourseResolver from 'discourse/ember/resolver';
+import { buildResolver } from 'discourse-common/resolver';
import { default as computed, observes } from 'ember-addons/ember-computed-decorators';
const _pluginCallbacks = [];
@@ -6,7 +6,7 @@ const _pluginCallbacks = [];
const Discourse = Ember.Application.extend({
rootElement: '#main',
_docTitle: document.title,
- __TAGS_INCLUDED__: true,
+ RAW_TEMPLATES: {},
getURL(url) {
if (!url) return url;
@@ -31,7 +31,7 @@ const Discourse = Ember.Application.extend({
return url;
},
- Resolver: DiscourseResolver,
+ Resolver: buildResolver('discourse'),
@observes('_docTitle', 'hasFocus', 'notifyCount')
_titleChanged() {
@@ -104,7 +104,14 @@ const Discourse = Ember.Application.extend({
if (/\/pre\-initializers\//.test(key)) {
const module = require(key, null, null, true);
if (!module) { throw new Error(key + ' must export an initializer.'); }
- Discourse.initializer(module.default);
+
+ const init = module.default;
+ const oldInitialize = init.initialize;
+ init.initialize = function() {
+ oldInitialize.call(this, Discourse.__container__, Discourse);
+ };
+
+ Discourse.initializer(init);
}
});
@@ -115,8 +122,8 @@ const Discourse = Ember.Application.extend({
const init = module.default;
const oldInitialize = init.initialize;
- init.initialize = function(app) {
- oldInitialize.call(this, app.container, Discourse);
+ init.initialize = function() {
+ oldInitialize.call(this, Discourse.__container__, Discourse);
};
Discourse.instanceInitializer(init);
@@ -130,20 +137,11 @@ const Discourse = Ember.Application.extend({
Discourse.instanceInitializer({
name: "_discourse_plugin_" + (++initCount),
after: 'inject-objects',
- initialize: function() {
+ initialize() {
withPluginApi(cb.version, cb.code);
}
});
});
-
- const utils = require('discourse/lib/utilities');
- Discourse.Utilities = {};
- Object.keys(utils).forEach(function(k) {
- Discourse.Utilities[k] = function() {
- Ember.warn('Discourse.Utilities is deprecated. Import it as a module');
- return utils[k].apply(utils, arguments);
- };
- });
},
@computed('currentAssetVersion', 'desiredAssetVersion')
diff --git a/app/assets/javascripts/discourse/adapters/rest.js.es6 b/app/assets/javascripts/discourse/adapters/rest.js.es6
index 75366ca80e5..72d05fb7dde 100644
--- a/app/assets/javascripts/discourse/adapters/rest.js.es6
+++ b/app/assets/javascripts/discourse/adapters/rest.js.es6
@@ -1,8 +1,7 @@
import { ajax } from 'discourse/lib/ajax';
import { hashString } from 'discourse/lib/hash';
-const ADMIN_MODELS = ['plugin', 'site-customization', 'embeddable-host'];
-
+const ADMIN_MODELS = ['plugin', 'site-customization', 'embeddable-host', 'web-hook', 'web-hook-event'];
export function Result(payload, responseJson) {
this.payload = payload;
@@ -57,8 +56,8 @@ export default Ember.Object.extend({
return this.appendQueryParams(path, findArgs);
},
- findAll(store, type) {
- return ajax(this.pathFor(store, type)).catch(rethrow);
+ findAll(store, type, findArgs) {
+ return ajax(this.pathFor(store, type, findArgs)).catch(rethrow);
},
diff --git a/app/assets/javascripts/discourse/components/activity-filter.js.es6 b/app/assets/javascripts/discourse/components/activity-filter.js.es6
deleted file mode 100644
index c0cf5b4e4eb..00000000000
--- a/app/assets/javascripts/discourse/components/activity-filter.js.es6
+++ /dev/null
@@ -1,66 +0,0 @@
-import StringBuffer from 'discourse/mixins/string-buffer';
-import UserAction from "discourse/models/user-action";
-
-export default Ember.Component.extend(StringBuffer, {
- tagName: 'li',
- classNameBindings: ['active', 'noGlyph'],
-
- rerenderTriggers: ['content.count', 'count'],
- noGlyph: Em.computed.empty('icon'),
-
- isIndexStream: function() {
- return !this.get('content');
- }.property('content.count'),
-
- active: function() {
- if (this.get('isIndexStream')) {
- return !this.get('userActionType');
- }
- const content = this.get('content');
- if (content) {
- return parseInt(this.get('userActionType'), 10) === parseInt(Em.get(content, 'action_type'), 10);
- }
- }.property('userActionType', 'isIndexStream'),
-
- activityCount: function() {
- return this.get('content.count') || this.get('count') || 0;
- }.property('content.count', 'count'),
-
- typeKey: function() {
- const actionType = this.get('content.action_type');
- if (actionType === UserAction.TYPES.messages_received) { return ""; }
-
- const result = UserAction.TYPES_INVERTED[actionType];
- if (!result) { return ""; }
-
- // We like our URLS to have hyphens, not underscores
- return "/" + result.replace("_", "-");
- }.property('content.action_type'),
-
- url: function() {
- return "/users/" + this.get('user.username_lower') + "/activity" + this.get('typeKey');
- }.property('typeKey', 'user.username_lower'),
-
- description: function() {
- return this.get('content.description') || I18n.t("user.filters.all");
- }.property('content.description'),
-
- renderString(buffer) {
- buffer.push("");
- const icon = this.get('icon');
- if (icon) {
- buffer.push(" ");
- }
- buffer.push(this.get('description') + " (" + this.get('activityCount') + ")");
- },
-
- icon: function() {
- switch(parseInt(this.get('content.action_type'), 10)) {
- case UserAction.TYPES.likes_received: return "heart";
- case UserAction.TYPES.bookmarks: return "bookmark";
- case UserAction.TYPES.edits: return "pencil";
- case UserAction.TYPES.replies: return "reply";
- case UserAction.TYPES.mentions: return "at";
- }
- }.property("content.action_type")
-});
diff --git a/app/assets/javascripts/discourse/components/add-category-class.js.es6 b/app/assets/javascripts/discourse/components/add-category-class.js.es6
new file mode 100644
index 00000000000..7d8ad2dc376
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/add-category-class.js.es6
@@ -0,0 +1,34 @@
+import { observes } from 'ember-addons/ember-computed-decorators';
+
+export default Ember.Component.extend({
+ _slug: null,
+
+ didInsertElement() {
+ this._super();
+ this.refreshClass();
+ },
+
+ _updateClass() {
+ if (this.isDestroying || this.isDestroyed) { return; }
+ const slug = this.get('category.fullSlug');
+ this._removeClass();
+ if (slug) {
+ $("body").addClass(`category-${slug}`);
+ }
+ },
+
+ @observes('category.fullSlug')
+ refreshClass() {
+ Ember.run.scheduleOnce('afterRender', this, this._updateClass);
+ },
+
+ _removeClass() {
+ $("body").removeClass((_, css) => (css.match(/\bcategory-\S+/g) || []).join(" "));
+ },
+
+ willDestroyElement() {
+ this._super();
+ this._removeClass();
+ }
+
+});
diff --git a/app/assets/javascripts/discourse/components/avatar-flair.js.es6 b/app/assets/javascripts/discourse/components/avatar-flair.js.es6
new file mode 100644
index 00000000000..4beaa9cdf5f
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/avatar-flair.js.es6
@@ -0,0 +1,20 @@
+import { observes } from 'ember-addons/ember-computed-decorators';
+import MountWidget from 'discourse/components/mount-widget';
+
+export default MountWidget.extend({
+ widget: 'avatar-flair',
+
+ @observes('flairURL', 'flairBgColor', 'flairColor')
+ _rerender() {
+ this.queueRerender();
+ },
+
+ buildArgs() {
+ return {
+ primary_group_flair_url: this.get('flairURL'),
+ primary_group_flair_bg_color: this.get('flairBgColor'),
+ primary_group_flair_color: this.get('flairColor'),
+ primary_group_name: this.get('groupName')
+ };
+ }
+});
diff --git a/app/assets/javascripts/discourse/components/avatar-uploader.js.es6 b/app/assets/javascripts/discourse/components/avatar-uploader.js.es6
index 539171bc9a1..fd5bac3c0e0 100644
--- a/app/assets/javascripts/discourse/components/avatar-uploader.js.es6
+++ b/app/assets/javascripts/discourse/components/avatar-uploader.js.es6
@@ -11,6 +11,10 @@ export default Em.Component.extend(UploadMixin, {
return uploading ? I18n.t("uploading") : I18n.t("user.change_avatar.upload_picture");
},
+ validateUploadedFilesOptions() {
+ return { imagesOnly: true };
+ },
+
uploadDone(upload) {
this.setProperties({
imageIsNotASquare: upload.width !== upload.height,
diff --git a/app/assets/javascripts/discourse/components/badge-selector.js.es6 b/app/assets/javascripts/discourse/components/badge-selector.js.es6
new file mode 100644
index 00000000000..8f0bd5ecfeb
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/badge-selector.js.es6
@@ -0,0 +1,48 @@
+import { on, observes, default as computed } from 'ember-addons/ember-computed-decorators';
+import { findRawTemplate } from 'discourse/lib/raw-templates';
+
+export default Ember.Component.extend({
+ @computed('placeholderKey')
+ placeholder(placeholderKey) {
+ return placeholderKey ? I18n.t(placeholderKey) : '';
+ },
+
+ @observes('badgeNames')
+ _update() {
+ if (this.get('canReceiveUpdates') === 'true')
+ this._initializeAutocomplete({updateData: true});
+ },
+
+ @on('didInsertElement')
+ _initializeAutocomplete(opts) {
+ var self = this;
+ var selectedBadges;
+
+ self.$('input').autocomplete({
+ allowAny: false,
+ items: _.isArray(this.get('badgeNames')) ? this.get('badgeNames') : [this.get('badgeNames')],
+ single: this.get('single'),
+ updateData: (opts && opts.updateData) ? opts.updateData : false,
+ onChangeItems: function(items){
+ selectedBadges = items;
+ self.set("badgeNames", items.join(","));
+ },
+ transformComplete: function(g) {
+ return g.name;
+ },
+ dataSource: function(term) {
+ return self.get("badgeFinder")(term).then(function(badges){
+
+ if(!selectedBadges){
+ return badges;
+ }
+
+ return badges.filter(function(badge){
+ return !selectedBadges.any(function(s){return s === badge.name;});
+ });
+ });
+ },
+ template: findRawTemplate('badge-selector-autocomplete')
+ });
+ }
+});
diff --git a/app/assets/javascripts/discourse/components/basic-topic-list.js.es6 b/app/assets/javascripts/discourse/components/basic-topic-list.js.es6
index 75c4d370c0b..ac358350a91 100644
--- a/app/assets/javascripts/discourse/components/basic-topic-list.js.es6
+++ b/app/assets/javascripts/discourse/components/basic-topic-list.js.es6
@@ -47,12 +47,10 @@ export default Ember.Component.extend({
target = target.find('a');
}
- const topic = this.get('topics').findProperty('id', parseInt(topicId));
- this.sendAction('postsAction', {topic, position: target.offset()});
+ const topic = this.get('topics').findBy('id', parseInt(topicId));
+ this.appEvents.trigger('topic-entrance:show', { topic, position: target.offset() });
}
return false;
}
-
}
-
});
diff --git a/app/assets/javascripts/discourse/components/bread-crumbs.js.es6 b/app/assets/javascripts/discourse/components/bread-crumbs.js.es6
index 6841e8e4569..28a06d70004 100644
--- a/app/assets/javascripts/discourse/components/bread-crumbs.js.es6
+++ b/app/assets/javascripts/discourse/components/bread-crumbs.js.es6
@@ -35,9 +35,4 @@ export default Ember.Component.extend({
});
}.property('firstCategory', 'hideSubcategories'),
- render(buffer) {
- if (this.get('hidden')) { return; }
- this._super(buffer);
- }
-
});
diff --git a/app/assets/javascripts/discourse/components/categories-admin-dropdown.js.es6 b/app/assets/javascripts/discourse/components/categories-admin-dropdown.js.es6
index b2fea03ffdf..8dbb4d34231 100644
--- a/app/assets/javascripts/discourse/components/categories-admin-dropdown.js.es6
+++ b/app/assets/javascripts/discourse/components/categories-admin-dropdown.js.es6
@@ -1,4 +1,4 @@
-import { iconHTML } from 'discourse/helpers/fa-icon';
+import { iconHTML } from 'discourse-common/helpers/fa-icon';
import DropdownButton from 'discourse/components/dropdown-button';
import computed from "ember-addons/ember-computed-decorators";
diff --git a/app/assets/javascripts/discourse/components/categories-and-latest-topics.js.es6 b/app/assets/javascripts/discourse/components/categories-and-latest-topics.js.es6
new file mode 100644
index 00000000000..8da2cf8495d
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/categories-and-latest-topics.js.es6
@@ -0,0 +1,3 @@
+export default Ember.Component.extend({
+ classNames: ["categories-and-latest"]
+});
diff --git a/app/assets/javascripts/discourse/components/category-chooser.js.es6 b/app/assets/javascripts/discourse/components/category-chooser.js.es6
index ddc8aad2b0b..ab0c704b59b 100644
--- a/app/assets/javascripts/discourse/components/category-chooser.js.es6
+++ b/app/assets/javascripts/discourse/components/category-chooser.js.es6
@@ -1,4 +1,4 @@
-import ComboboxView from 'discourse/components/combo-box';
+import ComboboxView from 'discourse-common/components/combo-box';
import { categoryBadgeHTML } from 'discourse/helpers/category-link';
import computed from 'ember-addons/ember-computed-decorators';
import { observes, on } from 'ember-addons/ember-computed-decorators';
@@ -38,7 +38,7 @@ export default ComboboxView.extend({
@computed("rootNone")
none(rootNone) {
- if (Discourse.SiteSettings.allow_uncategorized_topics) {
+ if (Discourse.SiteSettings.allow_uncategorized_topics || this.get('allowUncategorized')) {
if (rootNone) {
return "category.none";
} else {
diff --git a/app/assets/javascripts/discourse/components/category-group.js.es6 b/app/assets/javascripts/discourse/components/category-group.js.es6
deleted file mode 100644
index 4daca78a652..00000000000
--- a/app/assets/javascripts/discourse/components/category-group.js.es6
+++ /dev/null
@@ -1,37 +0,0 @@
-import { categoryBadgeHTML } from 'discourse/helpers/category-link';
-import Category from 'discourse/models/category';
-
-export default Ember.Component.extend({
-
- _initializeAutocomplete: function() {
- const self = this,
- template = this.container.lookup('template:category-group-autocomplete.raw'),
- regexp = new RegExp(`href=['\"]${Discourse.getURL('/c/')}([^'\"]+)`);
-
- this.$('input').autocomplete({
- items: this.get('categories'),
- single: false,
- allowAny: false,
- dataSource(term){
- return Category.list().filter(function(category){
- const regex = new RegExp(term, "i");
- return category.get("name").match(regex) &&
- !_.contains(self.get('blacklist') || [], category) &&
- !_.contains(self.get('categories'), category) ;
- });
- },
- onChangeItems(items) {
- const categories = _.map(items, function(link) {
- const slug = link.match(regexp)[1];
- return Category.findSingleBySlug(slug);
- });
- Em.run.next(() => self.set("categories", categories));
- },
- template,
- transformComplete(category) {
- return categoryBadgeHTML(category, {allowUncategorized: true});
- }
- });
- }.on('didInsertElement')
-
-});
diff --git a/app/assets/javascripts/discourse/components/category-logo-link.js.es6 b/app/assets/javascripts/discourse/components/category-logo-link.js.es6
deleted file mode 100644
index d9f9ca235ae..00000000000
--- a/app/assets/javascripts/discourse/components/category-logo-link.js.es6
+++ /dev/null
@@ -1,12 +0,0 @@
-export default Em.Component.extend({
- tagName: 'a',
- attributeBindings: ['href'],
- href: function() {
- return Discourse.getURL('/c/') + Discourse.Category.slugFor(this.get('category'));
- }.property(),
-
- render(buffer) {
- const categoryLogo = this.get('category.logo_url');
- buffer.push(`
`);
- }
-});
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/components/category-selector.js.es6 b/app/assets/javascripts/discourse/components/category-selector.js.es6
new file mode 100644
index 00000000000..9cb3eec14ae
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/category-selector.js.es6
@@ -0,0 +1,49 @@
+import { categoryBadgeHTML } from 'discourse/helpers/category-link';
+import Category from 'discourse/models/category';
+import { on, observes } from 'ember-addons/ember-computed-decorators';
+import { findRawTemplate } from 'discourse/lib/raw-templates';
+
+export default Ember.Component.extend({
+ @observes('categories')
+ _update() {
+ if (this.get('canReceiveUpdates') === 'true')
+ this._initializeAutocomplete({updateData: true});
+ },
+
+ @on('didInsertElement')
+ _initializeAutocomplete(opts) {
+ const self = this,
+ regexp = new RegExp(`href=['\"]${Discourse.getURL('/c/')}([^'\"]+)`);
+
+ this.$('input').autocomplete({
+ items: this.get('categories'),
+ single: this.get('single'),
+ allowAny: false,
+ updateData: (opts && opts.updateData) ? opts.updateData : false,
+ dataSource(term) {
+ return Category.list().filter(category => {
+ const regex = new RegExp(term, 'i');
+ return category.get('name').match(regex) &&
+ !_.contains(self.get('blacklist') || [], category) &&
+ !_.contains(self.get('categories'), category) ;
+ });
+ },
+ onChangeItems(items) {
+ const categories = _.map(items, link => {
+ const slug = link.match(regexp)[1];
+ return Category.findSingleBySlug(slug);
+ });
+ Em.run.next(() => {
+ let existingCategory = _.isArray(self.get('categories')) ? self.get('categories') : [self.get('categories')];
+ const result = _.intersection(existingCategory.map(itm => itm.id), categories.map(itm => itm.id));
+ if (result.length !== categories.length || existingCategory.length !== categories.length)
+ self.set('categories', categories);
+ });
+ },
+ template: findRawTemplate('category-selector-autocomplete'),
+ transformComplete(category) {
+ return categoryBadgeHTML(category, {allowUncategorized: true});
+ }
+ });
+ }
+});
diff --git a/app/assets/javascripts/discourse/components/category-title-link.js.es6 b/app/assets/javascripts/discourse/components/category-title-link.js.es6
index bc30157ca6e..7c1c013375b 100644
--- a/app/assets/javascripts/discourse/components/category-title-link.js.es6
+++ b/app/assets/javascripts/discourse/components/category-title-link.js.es6
@@ -1,17 +1,3 @@
-import { iconHTML } from 'discourse/helpers/fa-icon';
-
-export default Em.Component.extend({
- tagName: 'h3',
-
- render(buffer) {
- const category = this.get('category');
- const categoryUrl = Discourse.getURL('/c/') + Discourse.Category.slugFor(category);
- const categoryName = Handlebars.Utils.escapeExpression(category.get('name'));
-
- if (category.get('read_restricted')) { buffer.push(iconHTML('lock')); }
-
- buffer.push(``);
- buffer.push(`${categoryName}`);
- buffer.push(``);
- }
+export default Ember.Component.extend({
+ tagName: 'h3'
});
diff --git a/app/assets/javascripts/discourse/components/check-mark.js.es6 b/app/assets/javascripts/discourse/components/check-mark.js.es6
index a934a490a45..34585e1a0fa 100644
--- a/app/assets/javascripts/discourse/components/check-mark.js.es6
+++ b/app/assets/javascripts/discourse/components/check-mark.js.es6
@@ -7,10 +7,5 @@ export default Ember.Component.extend({
@computed('checked')
status(checked) {
return checked ? 'status-checked' : 'status-unchecked';
- },
-
- render(buffer) {
- const icon = this.get('checked') ? 'check' : 'times';
- buffer.push(``);
}
});
diff --git a/app/assets/javascripts/discourse/components/color-picker-choice.js.es6 b/app/assets/javascripts/discourse/components/color-picker-choice.js.es6
new file mode 100644
index 00000000000..78f444a1c12
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/color-picker-choice.js.es6
@@ -0,0 +1,27 @@
+import computed from 'ember-addons/ember-computed-decorators';
+
+export default Ember.Component.extend({
+ tagName: 'button',
+ attributeBindings: ['style', 'title'],
+ classNameBindings: [':colorpicker', 'isUsed:used-color:unused-color'],
+
+ @computed('color', 'usedColors')
+ isUsed(color, usedColors) {
+ return (usedColors || []).indexOf(color.toUpperCase()) >= 0;
+ },
+
+ @computed('isUsed')
+ title(isUsed) {
+ return isUsed ? I18n.t("category.already_used") : null;
+ },
+
+ @computed('color')
+ style(color) {
+ return `background-color: #${color};`.htmlSafe();
+ },
+
+ click(e) {
+ e.preventDefault();
+ this.sendAction('selectColor', this.get('color'));
+ }
+});
diff --git a/app/assets/javascripts/discourse/components/color-picker.js.es6 b/app/assets/javascripts/discourse/components/color-picker.js.es6
index d1acf7d8114..30c95f9ca21 100644
--- a/app/assets/javascripts/discourse/components/color-picker.js.es6
+++ b/app/assets/javascripts/discourse/components/color-picker.js.es6
@@ -1,30 +1,9 @@
-import DiscourseContainerView from 'discourse/views/container';
-
-export default DiscourseContainerView.extend({
+export default Ember.Component.extend({
classNames: 'colors-container',
- _createButtons: function() {
- var colors = this.get('colors'),
- isUsed, usedColors = this.get('usedColors') || [];
-
- if (!colors) return;
-
- var self = this;
- colors.forEach(function(color) {
- isUsed = usedColors.indexOf(color.toUpperCase()) >= 0;
-
- self.attachViewWithArgs({
- tagName: 'button',
- attributeBindings: ['style', 'title'],
- classNames: ['colorpicker'].concat( isUsed ? ['used-color'] : ['unused-color'] ),
- style: ('background-color: #' + color + ';').htmlSafe(),
- title: isUsed ? I18n.t("category.already_used") : null,
- click: function() {
- self.set("value", color);
- return false;
- }
- });
-
- });
- }.on('init')
+ actions: {
+ selectColor(color) {
+ this.set('value', color);
+ }
+ }
});
diff --git a/app/assets/javascripts/discourse/views/composer.js.es6 b/app/assets/javascripts/discourse/components/composer-body.js.es6
similarity index 78%
rename from app/assets/javascripts/discourse/views/composer.js.es6
rename to app/assets/javascripts/discourse/components/composer-body.js.es6
index c3ad0afe7b9..e9e4552a2b4 100644
--- a/app/assets/javascripts/discourse/views/composer.js.es6
+++ b/app/assets/javascripts/discourse/components/composer-body.js.es6
@@ -1,20 +1,19 @@
+import { default as computed, observes } from 'ember-addons/ember-computed-decorators';
+import Composer from 'discourse/models/composer';
import afterTransition from 'discourse/lib/after-transition';
import positioningWorkaround from 'discourse/lib/safari-hacks';
import { headerHeight } from 'discourse/components/site-header';
-import { default as computed, on, observes } from 'ember-addons/ember-computed-decorators';
-import Composer from 'discourse/models/composer';
-const ComposerView = Ember.View.extend({
- _lastKeyTimeout: null,
+export default Ember.Component.extend({
elementId: 'reply-control',
+
classNameBindings: ['composer.creatingPrivateMessage:private-message',
'composeState',
'composer.loading',
'composer.canEditTitle:edit-title',
'composer.createdPost:created-post',
- 'composer.creatingTopic:topic'],
-
- composer: Em.computed.alias('controller.model'),
+ 'composer.creatingTopic:topic',
+ 'composer.whisper:composing-whisper'],
@computed('composer.composeState')
composeState(composeState) {
@@ -28,9 +27,11 @@ const ComposerView = Ember.View.extend({
this.appEvents.trigger("composer:resized");
},
- @observes('composeState', 'composer.action')
+ @observes('composeState', 'composer.action', 'composer.canEditTopicFeaturedLink')
resize() {
Ember.run.scheduleOnce('afterRender', () => {
+ if (!this.element || this.isDestroying || this.isDestroyed) { return; }
+
const h = $('#reply-control').height() || 0;
this.movePanels(h + "px");
@@ -50,10 +51,7 @@ const ComposerView = Ember.View.extend({
},
keyUp() {
- const controller = this.get('controller');
- controller.checkReplyLength();
-
- this.get('composer').typing();
+ this.sendAction('typed');
const lastKeyUp = new Date();
this._lastKeyUp = lastKeyUp;
@@ -69,18 +67,24 @@ const ComposerView = Ember.View.extend({
keyDown(e) {
if (e.which === 27) {
- this.get('controller').send('hitEsc');
- this.get('controller').send('hideOptions');
+ this.sendAction('cancelled');
return false;
} else if (e.which === 13 && (e.ctrlKey || e.metaKey)) {
// CTRL+ENTER or CMD+ENTER
- this.get('controller').send('save');
+ this.sendAction('save');
return false;
}
},
- @on('didInsertElement')
- _enableResizing() {
+ @observes('composeState')
+ disableFullscreen() {
+ if (this.get('composeState') !== Composer.OPEN && positioningWorkaround.blur) {
+ positioningWorkaround.blur();
+ }
+ },
+
+ didInsertElement() {
+ this._super();
const $replyControl = $('#reply-control');
const resize = () => Ember.run(() => this.resize());
@@ -112,9 +116,7 @@ const ComposerView = Ember.View.extend({
},
click() {
- this.get('controller').send('openIfDraft');
- }
-});
+ this.sendAction('openIfDraft');
+ },
-RSVP.EventTarget.mixin(ComposerView);
-export default ComposerView;
+});
diff --git a/app/assets/javascripts/discourse/components/composer-editor.js.es6 b/app/assets/javascripts/discourse/components/composer-editor.js.es6
index c5113a20cf4..a851ae88609 100644
--- a/app/assets/javascripts/discourse/components/composer-editor.js.es6
+++ b/app/assets/javascripts/discourse/components/composer-editor.js.es6
@@ -2,11 +2,11 @@ import userSearch from 'discourse/lib/user-search';
import { default as computed, on } from 'ember-addons/ember-computed-decorators';
import { linkSeenMentions, fetchUnseenMentions } from 'discourse/lib/link-mentions';
import { linkSeenCategoryHashtags, fetchUnseenCategoryHashtags } from 'discourse/lib/link-category-hashtags';
-import { fetchUnseenTagHashtags, linkSeenTagHashtags } from 'discourse/lib/link-tag-hashtag';
+import { linkSeenTagHashtags, fetchUnseenTagHashtags } from 'discourse/lib/link-tag-hashtag';
import { load } from 'pretty-text/oneboxer';
import { ajax } from 'discourse/lib/ajax';
import InputValidation from 'discourse/models/input-validation';
-
+import { findRawTemplate } from 'discourse/lib/raw-templates';
import { tinyAvatar,
displayErrorForUpload,
getUploadMarkdown,
@@ -41,22 +41,6 @@ export default Ember.Component.extend({
return showPreview ? I18n.t('composer.hide_preview') : I18n.t('composer.show_preview');
},
- _renderUnseenTagHashtags($preview, unseen) {
- fetchUnseenTagHashtags(unseen).then(() => {
- linkSeenTagHashtags($preview);
- });
- },
-
- @on('previewRefreshed')
- paintTagHashtags($preview) {
- if (!this.siteSettings.tagging_enabled) { return; }
-
- const unseenTagHashtags = linkSeenTagHashtags($preview);
- if (unseenTagHashtags.length) {
- Ember.run.debounce(this, this._renderUnseenTagHashtags, $preview, unseenTagHashtags, 500);
- }
- },
-
@computed
markdownOptions() {
return {
@@ -66,7 +50,7 @@ export default Ember.Component.extend({
const posts = topic.get('postStream.posts');
if (posts && topicId === topic.get('id')) {
- const quotedPost = posts.findProperty("post_number", postNumber);
+ const quotedPost = posts.findBy("post_number", postNumber);
if (quotedPost) {
return tinyAvatar(quotedPost.get('avatar_template'));
}
@@ -78,10 +62,9 @@ export default Ember.Component.extend({
@on('didInsertElement')
_composerEditorInit() {
const topicId = this.get('topic.id');
- const template = this.container.lookup('template:user-selector-autocomplete.raw');
const $input = this.$('.d-editor-input');
$input.autocomplete({
- template,
+ template: findRawTemplate('user-selector-autocomplete'),
dataSource: term => userSearch({ term, topicId, includeGroups: true }),
key: "@",
transformComplete: v => v.username || v.name
@@ -152,34 +135,70 @@ export default Ember.Component.extend({
$preview.scrollTop(desired + 50);
},
- _renderUnseenMentions: function($preview, unseen) {
- fetchUnseenMentions($preview, unseen).then(() => {
+ _renderUnseenMentions($preview, unseen) {
+ // 'Create a New Topic' scenario is not supported (per conversation with codinghorror)
+ // https://meta.discourse.org/t/taking-another-1-7-release-task/51986/7
+ fetchUnseenMentions(unseen, this.get('topic.id')).then(() => {
linkSeenMentions($preview, this.siteSettings);
this._warnMentionedGroups($preview);
+ this._warnCannotSeeMention($preview);
});
},
- _renderUnseenCategoryHashtags: function($preview, unseen) {
+ _renderUnseenCategoryHashtags($preview, unseen) {
fetchUnseenCategoryHashtags(unseen).then(() => {
linkSeenCategoryHashtags($preview);
});
},
+ _renderUnseenTagHashtags($preview, unseen) {
+ fetchUnseenTagHashtags(unseen).then(() => {
+ linkSeenTagHashtags($preview);
+ });
+ },
+
+ _loadOneboxes($oneboxes) {
+ const post = this.get('composer.post');
+ let refresh = false;
+
+ // If we are editing a post, we'll refresh its contents once.
+ if (post && !post.get('refreshedPost')) {
+ refresh = true;
+ post.set('refreshedPost', true);
+ }
+
+ $oneboxes.each((_, o) => load(o, refresh, ajax, this.currentUser.id));
+ },
+
_warnMentionedGroups($preview) {
Ember.run.scheduleOnce('afterRender', () => {
- this._warnedMentions = this._warnedMentions || [];
- var found = [];
+ var found = this.get('warnedGroupMentions') || [];
$preview.find('.mention-group.notify').each((idx,e) => {
const $e = $(e);
var name = $e.data('name');
- found.push(name);
- if (this._warnedMentions.indexOf(name) === -1){
- this._warnedMentions.push(name);
+ if (found.indexOf(name) === -1){
this.sendAction('groupsMentioned', [{name: name, user_count: $e.data('mentionable-user-count')}]);
+ found.push(name);
}
});
- this._warnedMentions = found;
+ this.set('warnedGroupMentions', found);
+ });
+ },
+
+ _warnCannotSeeMention($preview) {
+ Ember.run.scheduleOnce('afterRender', () => {
+ var found = this.get('warnedCannotSeeMentions') || [];
+ $preview.find('.mention.cannot-see').each((idx,e) => {
+ const $e = $(e);
+ var name = $e.data('name');
+ if (found.indexOf(name) === -1) {
+ this.sendAction('cannotSeeMention', [{name: name}]);
+ found.push(name);
+ }
+ });
+
+ this.set('warnedCannotSeeMentions', found);
});
},
@@ -296,7 +315,13 @@ export default Ember.Component.extend({
// Believe it or not pasting an image in Firefox doesn't work without this code
_firefoxPastingHack() {
const uaMatch = navigator.userAgent.match(/Firefox\/(\d+)\.\d/);
- if (uaMatch && parseInt(uaMatch[1]) >= 24) {
+ if (uaMatch) {
+ let uaVersion = parseInt(uaMatch[1]);
+ if (uaVersion < 24 || 50 <= uaVersion) {
+ // The hack is no longer required in FF 50 and later.
+ // See: https://bugzilla.mozilla.org/show_bug.cgi?id=906420
+ return;
+ }
this.$().append( Ember.$("") );
this.$("textarea").off('keydown.contenteditable');
this.$("textarea").on('keydown.contenteditable', event => {
@@ -475,31 +500,34 @@ export default Ember.Component.extend({
previewUpdated($preview) {
// Paint mentions
- const unseen = linkSeenMentions($preview, this.siteSettings);
- if (unseen.length) {
- Ember.run.debounce(this, this._renderUnseenMentions, $preview, unseen, 500);
+ const unseenMentions = linkSeenMentions($preview, this.siteSettings);
+ if (unseenMentions.length) {
+ Ember.run.debounce(this, this._renderUnseenMentions, $preview, unseenMentions, 450);
}
this._warnMentionedGroups($preview);
+ this._warnCannotSeeMention($preview);
// Paint category hashtags
- const unseenHashtags = linkSeenCategoryHashtags($preview);
- if (unseenHashtags.length) {
- Ember.run.debounce(this, this._renderUnseenCategoryHashtags, $preview, unseenHashtags, 500);
+ const unseenCategoryHashtags = linkSeenCategoryHashtags($preview);
+ if (unseenCategoryHashtags.length) {
+ Ember.run.debounce(this, this._renderUnseenCategoryHashtags, $preview, unseenCategoryHashtags, 450);
}
- const post = this.get('composer.post');
- let refresh = false;
-
- // If we are editing a post, we'll refresh its contents once. This is a feature that
- // allows a user to refresh its contents once.
- if (post && !post.get('refreshedPost')) {
- refresh = true;
- post.set('refreshedPost', true);
+ // Paint tag hashtags
+ if (this.siteSettings.tagging_enabled) {
+ const unseenTagHashtags = linkSeenTagHashtags($preview);
+ if (unseenTagHashtags.length) {
+ Ember.run.debounce(this, this._renderUnseenTagHashtags, $preview, unseenTagHashtags, 450);
+ }
}
// Paint oneboxes
- $('a.onebox', $preview).each((i, e) => load(e, refresh, ajax));
+ const $oneboxes = $('a.onebox', $preview);
+ if ($oneboxes.length > 0 && $oneboxes.length <= this.siteSettings.max_oneboxes_per_post) {
+ Ember.run.debounce(this, this._loadOneboxes, $oneboxes, 450);
+ }
+
this.trigger('previewRefreshed', $preview);
this.sendAction('afterRefresh', $preview);
},
diff --git a/app/assets/javascripts/discourse/components/composer-message.js.es6 b/app/assets/javascripts/discourse/components/composer-message.js.es6
index 39307dfcccd..7cbdc36b11f 100644
--- a/app/assets/javascripts/discourse/components/composer-message.js.es6
+++ b/app/assets/javascripts/discourse/components/composer-message.js.es6
@@ -1,11 +1,12 @@
import computed from 'ember-addons/ember-computed-decorators';
+import { getOwner } from 'discourse-common/lib/get-owner';
export default Ember.Component.extend({
classNameBindings: [':composer-popup', ':hidden', 'message.extraClass'],
@computed('message.templateName')
- defaultLayout(templateName) {
- return this.container.lookup(`template:composer/${templateName}`);
+ layout(templateName) {
+ return getOwner(this).lookup(`template:composer/${templateName}`);
},
didInsertElement() {
diff --git a/app/assets/javascripts/discourse/components/composer-messages.js.es6 b/app/assets/javascripts/discourse/components/composer-messages.js.es6
index d17a9aa0dde..59b3586dd32 100644
--- a/app/assets/javascripts/discourse/components/composer-messages.js.es6
+++ b/app/assets/javascripts/discourse/components/composer-messages.js.es6
@@ -15,12 +15,12 @@ export default Ember.Component.extend({
didInsertElement() {
this._super();
- this.reset();
this.appEvents.on('composer:typed-reply', this, this._typedReply);
this.appEvents.on('composer:opened', this, this._findMessages);
this.appEvents.on('composer:find-similar', this, this._findSimilar);
this.appEvents.on('composer-messages:close', this, this._closeTop);
this.appEvents.on('composer-messages:create', this, this._create);
+ Ember.run.scheduleOnce('afterRender', this, this.reset);
},
willDestroyElement() {
@@ -87,8 +87,13 @@ export default Ember.Component.extend({
const composer = this.get('composer');
if (composer.get('privateMessage')) {
- const usernames = composer.get('targetUsernames').split(',');
- if (usernames.length === 1 && usernames[0] === this.currentUser.get('username')) {
+ let usernames = composer.get('targetUsernames');
+
+ if (usernames) {
+ usernames = usernames.split(',');
+ }
+
+ if (usernames && usernames.length === 1 && usernames[0] === this.currentUser.get('username')) {
const message = this._yourselfConfirm || composer.store.createRecord('composer-message', {
id: 'yourself_confirm',
diff --git a/app/assets/javascripts/discourse/components/composer-title.js.es6 b/app/assets/javascripts/discourse/components/composer-title.js.es6
index 3d806ca0f7d..1a2eb1bea7c 100644
--- a/app/assets/javascripts/discourse/components/composer-title.js.es6
+++ b/app/assets/javascripts/discourse/components/composer-title.js.es6
@@ -1,8 +1,11 @@
-import computed from 'ember-addons/ember-computed-decorators';
+import { default as computed, observes } from 'ember-addons/ember-computed-decorators';
import InputValidation from 'discourse/models/input-validation';
+import { load, lookupCache } from 'pretty-text/oneboxer';
+import { ajax } from 'discourse/lib/ajax';
export default Ember.Component.extend({
classNames: ['title-input'],
+ watchForLink: Ember.computed.alias('composer.canEditTopicFeaturedLink'),
didInsertElement() {
this._super();
@@ -26,5 +29,83 @@ export default Ember.Component.extend({
if (reason) {
return InputValidation.create({ failed: true, reason, lastShownAt: lastValidatedAt });
}
+ },
+
+ @observes('composer.titleLength', 'watchForLink')
+ _titleChanged() {
+ if (this.get('composer.titleLength') === 0) { this.set('autoPosted', false); }
+ if (this.get('autoPosted') || !this.get('watchForLink')) { return; }
+
+ if (Ember.testing) {
+ this._checkForUrl();
+ } else {
+ Ember.run.debounce(this, this._checkForUrl, 500);
+ }
+ },
+
+ @observes('composer.replyLength')
+ _clearFeaturedLink() {
+ if (this.get('watchForLink') && this.get('composer.replyLength') === 0) {
+ this.set('composer.featuredLink', null);
+ }
+ },
+
+ _checkForUrl() {
+ if (!this.element || this.isDestroying || this.isDestroyed) { return; }
+
+ if (this.get('isAbsoluteUrl') && (this.get('composer.reply')||"").length === 0) {
+ // Try to onebox. If success, update post body and title.
+ this.set('composer.loading', true);
+
+ const link = document.createElement('a');
+ link.href = this.get('composer.title');
+
+ let loadOnebox = load(link, false, ajax, this.currentUser.id, true);
+
+ if (loadOnebox && loadOnebox.then) {
+ loadOnebox.then( () => {
+ this._updatePost(lookupCache(this.get('composer.title')));
+ }).finally(() => {
+ this.set('composer.loading', false);
+ Ember.run.schedule('afterRender', () => { this.$('input').putCursorAtEnd(); });
+ });
+ } else {
+ this._updatePost(loadOnebox);
+ this.set('composer.loading', false);
+ Ember.run.schedule('afterRender', () => { this.$('input').putCursorAtEnd(); });
+ }
+ }
+ },
+
+ _updatePost(html) {
+ if (html) {
+ this.set('autoPosted', true);
+ this.set('composer.featuredLink', this.get('composer.title'));
+
+ const $h = $(html),
+ heading = $h.find('h3').length > 0 ? $h.find('h3') : $h.find('h4');
+
+ this.set('composer.reply', this.get('composer.title'));
+
+ if (heading.length > 0 && heading.text().length > 0) {
+ this.changeTitle(heading.text());
+ } else {
+ const firstTitle = $h.attr('title') || $h.find("[title]").attr("title");
+ if (firstTitle && firstTitle.length > 0) {
+ this.changeTitle(firstTitle);
+ }
+ }
+ }
+ },
+
+ changeTitle(val) {
+ if (val && val.length > 0) {
+ this.set('composer.title', val.trim());
+ }
+ },
+
+ @computed('composer.title')
+ isAbsoluteUrl() {
+ return this.get('composer.titleLength') > 0 && /^(https?:)?\/\/[\w\.\-]+/i.test(this.get('composer.title'));
}
});
diff --git a/app/assets/javascripts/discourse/components/conditional-loading-spinner.js.es6 b/app/assets/javascripts/discourse/components/conditional-loading-spinner.js.es6
index 49e2eefca14..c248ea5b959 100644
--- a/app/assets/javascripts/discourse/components/conditional-loading-spinner.js.es6
+++ b/app/assets/javascripts/discourse/components/conditional-loading-spinner.js.es6
@@ -1,19 +1,10 @@
+import computed from 'ember-addons/ember-computed-decorators';
+
export default Ember.Component.extend({
classNameBindings: ['containerClass', 'condition:visible'],
- containerClass: function() {
- return this.get('size') === 'small' ? 'inline-spinner' : undefined;
- }.property('size'),
-
- render: function(buffer) {
- if (this.get('condition')) {
- buffer.push('');
- } else {
- return this._super(buffer);
- }
- },
-
- _conditionChanged: function() {
- this.rerender();
- }.observes('condition')
+ @computed('size')
+ containerClass(size) {
+ return size === 'small' ? 'inline-spinner' : undefined;
+ }
});
diff --git a/app/assets/javascripts/discourse/components/connector-container.js.es6 b/app/assets/javascripts/discourse/components/connector-container.js.es6
new file mode 100644
index 00000000000..905ec1058ee
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/connector-container.js.es6
@@ -0,0 +1 @@
+export default Ember.Component.extend();
diff --git a/app/assets/javascripts/discourse/components/count-i18n.js.es6 b/app/assets/javascripts/discourse/components/count-i18n.js.es6
index 28c908be236..0197b6bb760 100644
--- a/app/assets/javascripts/discourse/components/count-i18n.js.es6
+++ b/app/assets/javascripts/discourse/components/count-i18n.js.es6
@@ -1,8 +1,10 @@
-export default Ember.Component.extend(Discourse.StringBuffer, {
+import { bufferedRender } from 'discourse-common/lib/buffered-render';
+
+export default Ember.Component.extend(bufferedRender({
tagName: 'span',
rerenderTriggers: ['count', 'suffix'],
- renderString: function(buffer) {
+ buildBuffer(buffer) {
buffer.push(I18n.t(this.get('key') + (this.get('suffix') || ''), { count: this.get('count') }));
}
-});
+}));
diff --git a/app/assets/javascripts/discourse/components/create-account.js.es6 b/app/assets/javascripts/discourse/components/create-account.js.es6
new file mode 100644
index 00000000000..10328b0c15e
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/create-account.js.es6
@@ -0,0 +1,25 @@
+export default Ember.Component.extend({
+ classNames: ['create-account'],
+
+ didInsertElement() {
+ this._super();
+
+ if ($.cookie('email')) {
+ this.set('email', $.cookie('email'));
+ }
+
+ this.$().on('keydown.discourse-create-account', e => {
+ if (!this.get('disabled') && e.keyCode === 13) {
+ e.preventDefault();
+ e.stopPropagation();
+ this.sendAction();
+ return false;
+ }
+ });
+ },
+
+ willDestroyElement() {
+ this._super();
+ this.$().off('keydown.discourse-create-account');
+ }
+});
diff --git a/app/assets/javascripts/discourse/components/create-topics-notice.js.es6 b/app/assets/javascripts/discourse/components/create-topics-notice.js.es6
index fd4e09bf49a..5a7aaf1a747 100644
--- a/app/assets/javascripts/discourse/components/create-topics-notice.js.es6
+++ b/app/assets/javascripts/discourse/components/create-topics-notice.js.es6
@@ -36,7 +36,10 @@ export default Ember.Component.extend({
@computed()
shouldSee() {
- return Discourse.User.currentProp('admin') && this.siteSettings.show_create_topics_notice;
+ const user = this.currentUser;
+ return user && user.get('admin') &&
+ this.siteSettings.show_create_topics_notice &&
+ !this.site.get('wizard_required');
},
@computed('enabled', 'shouldSee', 'publicTopicCount', 'publicPostCount')
diff --git a/app/assets/javascripts/discourse/components/csv-uploader.js.es6 b/app/assets/javascripts/discourse/components/csv-uploader.js.es6
new file mode 100644
index 00000000000..d89aaae30b7
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/csv-uploader.js.es6
@@ -0,0 +1,23 @@
+import computed from "ember-addons/ember-computed-decorators";
+import UploadMixin from "discourse/mixins/upload";
+
+export default Em.Component.extend(UploadMixin, {
+ type: "csv",
+ tagName: "span",
+ uploadUrl: "/invites/upload_csv",
+
+ @computed("uploading")
+ uploadButtonText(uploading) {
+ return uploading ? I18n.t("uploading") : I18n.t("user.invited.bulk_invite.text");
+ },
+
+ @computed("uploading")
+ uploadButtonDisabled(uploading) {
+ // https://github.com/emberjs/ember.js/issues/10976#issuecomment-132417731
+ return uploading ? true : null;
+ },
+
+ uploadDone() {
+ bootbox.alert(I18n.t("user.invited.bulk_invite.success"));
+ }
+});
diff --git a/app/assets/javascripts/discourse/components/custom-html.js.es6 b/app/assets/javascripts/discourse/components/custom-html.js.es6
new file mode 100644
index 00000000000..c5df7fb51ed
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/custom-html.js.es6
@@ -0,0 +1,20 @@
+import { getCustomHTML } from 'discourse/helpers/custom-html';
+import { getOwner } from 'discourse-common/lib/get-owner';
+
+export default Ember.Component.extend({
+ init() {
+ this._super();
+ const name = this.get('name');
+ const html = getCustomHTML(name);
+
+ if (html) {
+ this.set('html', html);
+ this.set('layoutName', 'components/custom-html-container');
+ } else {
+ const template = getOwner(this).lookup(`template:${name}`);
+ if (template) {
+ this.set('layoutName', name);
+ }
+ }
+ }
+});
diff --git a/app/assets/javascripts/discourse/components/d-button.js.es6 b/app/assets/javascripts/discourse/components/d-button.js.es6
index 7737a995b27..bd606facafd 100644
--- a/app/assets/javascripts/discourse/components/d-button.js.es6
+++ b/app/assets/javascripts/discourse/components/d-button.js.es6
@@ -1,7 +1,9 @@
-import { iconHTML } from 'discourse/helpers/fa-icon';
-import { default as computed, observes } from 'ember-addons/ember-computed-decorators';
+import { default as computed } from 'ember-addons/ember-computed-decorators';
export default Ember.Component.extend({
+ // subclasses need this
+ layoutName: 'components/d-button',
+
tagName: 'button',
classNameBindings: [':btn', 'noText'],
attributeBindings: ['disabled', 'translatedTitle:title'],
@@ -18,24 +20,6 @@ export default Ember.Component.extend({
if (label) return I18n.t(label);
},
- @observes('icon')
- iconChanged() {
- this.rerender();
- },
-
- render(buffer) {
- const label = this.get('translatedLabel'),
- icon = this.get('icon');
-
- if (label || icon) {
- if (icon) { buffer.push(iconHTML(icon) + ' '); }
- if (label) { buffer.push(label); }
- } else {
- // If no label or icon is present, yield
- return this._super(buffer);
- }
- },
-
click() {
this.sendAction("action", this.get("actionParam"));
return false;
diff --git a/app/assets/javascripts/discourse/components/d-checkbox.js.es6 b/app/assets/javascripts/discourse/components/d-checkbox.js.es6
index bb15966c4d3..5e50bf98eda 100644
--- a/app/assets/javascripts/discourse/components/d-checkbox.js.es6
+++ b/app/assets/javascripts/discourse/components/d-checkbox.js.es6
@@ -3,16 +3,23 @@ import { on } from "ember-addons/ember-computed-decorators";
export default Ember.Component.extend({
tagName: 'label',
- @on('didInsertElement')
- _watchChanges() {
+ didInsertElement() {
+ this._super();
+
+ const checked = this.get('checked');
+ if (checked && checked !== "false") {
+ this.$('input').prop('checked', true);
+ }
+
// In Ember 13.3 we can use action on the checkbox `{{input}}` but not in 1.11
this.$('input').on('click.d-checkbox', () => {
- Ember.run.scheduleOnce('afterRender', () => this.sendAction('change', true));
+ Ember.run.scheduleOnce('afterRender', () => this.sendAction('change', this.$('input').prop('checked')));
});
},
@on('willDestroyElement')
- _stopWatching() {
+ willDestroyElement() {
+ this._super();
this.$('input').off('click.d-checkbox');
}
});
diff --git a/app/assets/javascripts/discourse/components/d-editor.js.es6 b/app/assets/javascripts/discourse/components/d-editor.js.es6
index 9fd9e43efa4..d5228324966 100644
--- a/app/assets/javascripts/discourse/components/d-editor.js.es6
+++ b/app/assets/javascripts/discourse/components/d-editor.js.es6
@@ -10,6 +10,10 @@ import { cook } from 'discourse/lib/text';
import { translations } from 'pretty-text/emoji/data';
import { emojiSearch } from 'pretty-text/emoji';
import { emojiUrlFor } from 'discourse/lib/text';
+import { getRegister } from 'discourse-common/lib/get-owner';
+import { findRawTemplate } from 'discourse/lib/raw-templates';
+import { determinePostReplaceSelection } from 'discourse/lib/utilities';
+import deprecated from 'discourse-common/lib/deprecated';
// Our head can be a static string or a function that returns a string
// based on input (like for numbered lists).
@@ -21,12 +25,19 @@ function getHead(head, prev) {
}
}
+function getButtonLabel(labelKey, defaultLabel) {
+ // use the Font Awesome icon if the label matches the default
+ return I18n.t(labelKey) === defaultLabel ? null : labelKey;
+}
+
const OP = {
NONE: 0,
REMOVED: 1,
ADDED: 2
};
+const FOUR_SPACES_INDENT = '4-spaces-indent';
+
const _createCallbacks = [];
class Toolbar {
@@ -44,6 +55,8 @@ class Toolbar {
trimLeading: true,
id: 'bold',
group: 'fontStyles',
+ icon: 'bold',
+ label: getButtonLabel('composer.bold_label', 'B'),
shortcut: 'B',
perform: e => e.applySurround('**', '**', 'bold_text')
});
@@ -52,6 +65,8 @@ class Toolbar {
trimLeading: true,
id: 'italic',
group: 'fontStyles',
+ icon: 'italic',
+ label: getButtonLabel('composer.italic_label', 'I'),
shortcut: 'I',
perform: e => e.applySurround('_', '_', 'italic_text')
});
@@ -89,7 +104,8 @@ class Toolbar {
this.addButton({
id: 'heading',
group: 'extras',
- icon: 'font',
+ icon: 'header',
+ label: getButtonLabel('composer.heading_label', 'H'),
shortcut: 'Alt+1',
perform: e => e.applyList('## ', 'heading_text')
});
@@ -111,7 +127,7 @@ class Toolbar {
}
addButton(button) {
- const g = this.groups.findProperty('group', button.group);
+ const g = this.groups.findBy('group', button.group);
if (!g) {
throw `Couldn't find toolbar group ${button.group}`;
}
@@ -119,7 +135,8 @@ class Toolbar {
const createdButton = {
id: button.id,
className: button.className || button.id,
- icon: button.icon || button.id,
+ label: button.label,
+ icon: button.label ? null : button.icon || button.id,
action: button.action || 'toolbarButton',
perform: button.perform || Ember.K,
trimLeading: button.trimLeading
@@ -169,7 +186,7 @@ export function addToolbarCallback(func) {
}
export function onToolbarCreate(func) {
- console.warn('`onToolbarCreate` is deprecated, use the plugin api instead.');
+ deprecated('`onToolbarCreate` is deprecated, use the plugin api instead.');
addToolbarCallback(func);
};
@@ -188,18 +205,30 @@ export default Ember.Component.extend({
return null;
},
- @on('didInsertElement')
- _startUp() {
- const container = this.get('container'),
- $editorInput = this.$('.d-editor-input');
-
- this._applyEmojiAutocomplete(container, $editorInput);
- this._applyCategoryHashtagAutocomplete(container, $editorInput);
-
+ _readyNow() {
this.set('ready', true);
- const mouseTrap = Mousetrap(this.$('.d-editor-input')[0]);
+ if (this.get('autofocus')) {
+ this.$('textarea').focus();
+ }
+ },
+ init() {
+ this._super();
+ this.register = getRegister(this);
+ },
+
+ didInsertElement() {
+ this._super();
+
+ const $editorInput = this.$('.d-editor-input');
+
+ this._applyEmojiAutocomplete($editorInput);
+ this._applyCategoryHashtagAutocomplete($editorInput);
+
+ Ember.run.scheduleOnce('afterRender', this, this._readyNow);
+
+ const mouseTrap = Mousetrap(this.$('.d-editor-input')[0]);
const shortcuts = this.get('toolbar.shortcuts');
Object.keys(shortcuts).forEach(sc => {
const button = shortcuts[sc];
@@ -219,7 +248,6 @@ export default Ember.Component.extend({
this.appEvents.on('composer:insert-text', text => this._addText(this._getSelected(), text));
this.appEvents.on('composer:replace-text', (oldVal, newVal) => this._replaceText(oldVal, newVal));
-
this._mouseTrap = mouseTrap;
},
@@ -254,7 +282,6 @@ export default Ember.Component.extend({
if (this._state !== "inDOM") { return; }
const $preview = this.$('.d-editor-preview');
if ($preview.length === 0) return;
-
this.sendAction('previewUpdated', $preview);
});
},
@@ -262,15 +289,20 @@ export default Ember.Component.extend({
@observes('ready', 'value')
_watchForChanges() {
if (!this.get('ready')) { return; }
- Ember.run.debounce(this, this._updatePreview, 30);
+
+ // Debouncing in test mode is complicated
+ if (Ember.testing) {
+ this._updatePreview();
+ } else {
+ Ember.run.debounce(this, this._updatePreview, 30);
+ }
},
- _applyCategoryHashtagAutocomplete(container) {
- const template = container.lookup('template:category-tag-autocomplete.raw');
+ _applyCategoryHashtagAutocomplete() {
const siteSettings = this.siteSettings;
this.$('.d-editor-input').autocomplete({
- template: template,
+ template: findRawTemplate('category-tag-autocomplete'),
key: '#',
transformComplete(obj) {
if (obj.model) {
@@ -288,14 +320,14 @@ export default Ember.Component.extend({
});
},
- _applyEmojiAutocomplete(container, $editorInput) {
+ _applyEmojiAutocomplete($editorInput) {
if (!this.siteSettings.enable_emoji) { return; }
- const template = container.lookup('template:emoji-selector-autocomplete.raw');
+ const register = this.register;
const self = this;
$editorInput.autocomplete({
- template: template,
+ template: findRawTemplate('emoji-selector-autocomplete'),
key: ":",
afterComplete(text) {
self.set('value', text);
@@ -307,7 +339,7 @@ export default Ember.Component.extend({
} else {
showSelector({
appendTo: self.$(),
- container,
+ register,
onSelect: title => {
// Remove the previously type characters when a new emoji is selected from the selector.
let selected = self._getSelected();
@@ -351,12 +383,12 @@ export default Ember.Component.extend({
});
},
- _getSelected(trimLeading) {
+ _getSelected(trimLeading, opts) {
if (!this.get('ready')) { return; }
const textarea = this.$('textarea.d-editor-input')[0];
const value = textarea.value;
- var start = textarea.selectionStart;
+ let start = textarea.selectionStart;
let end = textarea.selectionEnd;
// trim trailing spaces cause **test ** would be invalid
@@ -375,7 +407,12 @@ export default Ember.Component.extend({
const pre = value.slice(0, start);
const post = value.slice(end);
- return { start, end, value: selVal, pre, post };
+ if (opts && opts.lineVal) {
+ const lineVal = value.split("\n")[value.substr(0, textarea.selectionStart).split("\n").length - 1];
+ return { start, end, value: selVal, pre, post, lineVal };
+ } else {
+ return { start, end, value: selVal, pre, post };
+ }
},
_selectText(from, length) {
@@ -423,7 +460,7 @@ export default Ember.Component.extend({
}).join("\n");
},
- _applySurround(sel, head, tail, exampleKey) {
+ _applySurround(sel, head, tail, exampleKey, opts) {
const pre = sel.pre;
const post = sel.post;
@@ -435,6 +472,16 @@ export default Ember.Component.extend({
const example = I18n.t(`composer.${exampleKey}`);
this.set('value', `${pre}${hval}${example}${tail}${post}`);
this._selectText(pre.length + hlen, example.length);
+ } else if (opts && !opts.multiline) {
+ const [hval, hlen] = getHead(head);
+
+ if (pre.slice(-hlen) === hval && post.slice(0, tail.length) === tail) {
+ this.set('value', `${pre.slice(0, -hlen)}${sel.value}${post.slice(tail.length)}`);
+ this._selectText(sel.start - hlen, sel.value.length);
+ } else {
+ this.set('value', `${pre}${hval}${sel.value}${tail}${post}`);
+ this._selectText(sel.start + hlen, sel.value.length);
+ }
} else {
const lines = sel.value.split("\n");
@@ -479,11 +526,27 @@ export default Ember.Component.extend({
_replaceText(oldVal, newVal) {
const val = this.get('value');
- const loc = val.indexOf(oldVal);
- if (loc !== -1) {
- this.set('value', val.replace(oldVal, newVal));
- this._selectText(loc + newVal.length, 0);
+ const needleStart = val.indexOf(oldVal);
+
+ if (needleStart === -1) {
+ // Nothing to replace.
+ return;
}
+
+ const textarea = this.$('textarea.d-editor-input')[0];
+
+ // Determine post-replace selection.
+ const newSelection = determinePostReplaceSelection({
+ selection: { start: textarea.selectionStart, end: textarea.selectionEnd },
+ needle: { start: needleStart, end: needleStart + oldVal.length },
+ replacement: { start: needleStart, end: needleStart + newVal.length }
+ });
+
+ // Replace value (side effect: cursor at the end).
+ this.set('value', val.replace(oldVal, newVal));
+
+ // Restore cursor.
+ this._selectText(newSelection.start, newSelection.end - newSelection.start);
},
_addText(sel, text) {
@@ -503,9 +566,10 @@ export default Ember.Component.extend({
const toolbarEvent = {
selected,
selectText: (from, length) => this._selectText(from, length),
- applySurround: (head, tail, exampleKey) => this._applySurround(selected, head, tail, exampleKey),
+ applySurround: (head, tail, exampleKey, opts) => this._applySurround(selected, head, tail, exampleKey, opts),
applyList: (head, exampleKey) => this._applyList(selected, head, exampleKey),
addText: text => this._addText(selected, text),
+ replaceText: text => this._addText({pre: '', post: ''}, text),
getText: () => this.get('value'),
};
@@ -522,15 +586,32 @@ export default Ember.Component.extend({
},
formatCode() {
- const sel = this._getSelected();
- if (sel.value.indexOf("\n") !== -1) {
- return (this.siteSettings.code_formatting_style === "4-spaces-indent") ?
- this._applySurround(sel, ' ', '', 'code_text') :
- this._addText(sel, '```\n' + sel.value + '\n```');
+ const sel = this._getSelected('', { lineVal: true });
+ const selValue = sel.value;
+ const hasNewLine = selValue.indexOf("\n") !== -1;
+ const isBlankLine = sel.lineVal.trim().length === 0;
+ const isFourSpacesIndent = this.siteSettings.code_formatting_style === FOUR_SPACES_INDENT;
+
+ if (!hasNewLine) {
+ if (selValue.length === 0 && isBlankLine) {
+ if (isFourSpacesIndent) {
+ const example = I18n.t(`composer.code_text`);
+ this.set('value', `${sel.pre} ${example}${sel.post}`);
+ return this._selectText(sel.pre.length + 4, example.length);
+ } else {
+ return this._applySurround(sel, "```\n", "\n```", 'paste_code_text');
+ }
+ } else {
+ return this._applySurround(sel, '`', '`', 'code_title');
+ }
} else {
- return (this.siteSettings.code_formatting_style === "4-spaces-indent") ?
- this._applySurround(sel, '`', '`', 'code_text') :
- this._applySurround(sel, '```\n', '\n```', 'paste_code_text');
+ if (isFourSpacesIndent) {
+ return this._applySurround(sel, ' ', '', 'code_text');
+ } else {
+ const preNewline = (sel.pre[-1] !== "\n" && sel.pre !== "") ? "\n" : "";
+ const postNewline = sel.post[0] !== "\n" ? "\n" : "";
+ return this._addText(sel, `${preNewline}\`\`\`\n${sel.value}\n\`\`\`${postNewline}`);
+ }
}
},
@@ -560,7 +641,7 @@ export default Ember.Component.extend({
emoji() {
showSelector({
appendTo: this.$(),
- container: this.container,
+ register: this.register,
onSelect: title => this._addText(this._getSelected(), `:${title}:`)
});
}
diff --git a/app/assets/javascripts/discourse/components/d-link.js.es6 b/app/assets/javascripts/discourse/components/d-link.js.es6
deleted file mode 100644
index 54b1486a081..00000000000
--- a/app/assets/javascripts/discourse/components/d-link.js.es6
+++ /dev/null
@@ -1,69 +0,0 @@
-import computed from 'ember-addons/ember-computed-decorators';
-import { iconHTML } from 'discourse/helpers/fa-icon';
-import interceptClick from 'discourse/lib/intercept-click';
-
-export default Ember.Component.extend({
- tagName: 'a',
- classNames: ['d-link'],
- attributeBindings: ['translatedTitle:title', 'translatedTitle:aria-title', 'href'],
-
- @computed('path')
- href(path) {
- if (path) { return path; }
-
- const route = this.get('route');
- if (route) {
- const router = this.container.lookup('router:main');
- if (router && router.router) {
- const params = [route];
- const model = this.get('model');
- if (model) {
- params.push(model);
- }
-
- return Discourse.getURL(router.router.generate.apply(router.router, params));
- }
- }
-
- return '';
- },
-
- @computed("title")
- translatedTitle(title) {
- if (title) return I18n.t(title);
- },
-
- click(e) {
- const action = this.get('action');
- if (action) {
- this.sendAction('action');
- return false;
- }
-
- return interceptClick(e);
- },
-
- render(buffer) {
- if (!!this.get('template')) {
- return this._super(buffer);
- }
-
- const icon = this.get('icon');
- if (icon) {
- buffer.push(iconHTML(icon));
- }
-
- const label = this.get('label');
- if (label) {
- if (icon) { buffer.push(" "); }
-
- if (this.get('translateLabel') === "false") {
- buffer.push(label);
- } else {
- const count = this.get('count');
- buffer.push(I18n.t(label, { count }));
- }
- }
- }
-
-});
diff --git a/app/assets/javascripts/discourse/components/d-modal-body.js.es6 b/app/assets/javascripts/discourse/components/d-modal-body.js.es6
new file mode 100644
index 00000000000..42c797ddf96
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/d-modal-body.js.es6
@@ -0,0 +1,40 @@
+export default Ember.Component.extend({
+ classNames: ['modal-body'],
+
+ didInsertElement() {
+ this._super();
+ $('#modal-alert').hide();
+ $('#discourse-modal').modal('show');
+ Ember.run.scheduleOnce('afterRender', this, this._afterFirstRender);
+ this.appEvents.on('modal-body:flash', msg => this._flash(msg));
+ },
+
+ willDestroyElement() {
+ this._super();
+ this.appEvents.off('modal-body:flash');
+ },
+
+ _afterFirstRender() {
+ if (!this.site.mobileView && this.get('autoFocus') !== 'false') {
+ this.$('input:first').focus();
+ }
+
+ const maxHeight = this.get('maxHeight');
+ if (maxHeight) {
+ const maxHeightFloat = parseFloat(maxHeight) / 100.0;
+ if (maxHeightFloat > 0) {
+ const viewPortHeight = $(window).height();
+ this.$().css("max-height", Math.floor(maxHeightFloat * viewPortHeight) + "px");
+ }
+ }
+
+ this.appEvents.trigger('modal:body-shown', this.getProperties('title', 'rawTitle'));
+ },
+
+ _flash(msg) {
+ $('#modal-alert').hide()
+ .removeClass('alert-error', 'alert-success')
+ .addClass(`alert alert-${msg.messageClass || 'success'}`).html(msg.text || '')
+ .fadeIn();
+ },
+});
diff --git a/app/assets/javascripts/discourse/views/modal.js.es6 b/app/assets/javascripts/discourse/components/d-modal.js.es6
similarity index 73%
rename from app/assets/javascripts/discourse/views/modal.js.es6
rename to app/assets/javascripts/discourse/components/d-modal.js.es6
index 07f2bbeb148..475c79d0495 100644
--- a/app/assets/javascripts/discourse/views/modal.js.es6
+++ b/app/assets/javascripts/discourse/components/d-modal.js.es6
@@ -1,9 +1,8 @@
import { on } from "ember-addons/ember-computed-decorators";
-export default Ember.View.extend({
+export default Ember.Component.extend({
elementId: 'discourse-modal',
- templateName: 'modal/modal',
- classNameBindings: [':modal', ':hidden', 'controller.modalClass'],
+ classNameBindings: [':modal', ':hidden', 'modalClass'],
attributeBindings: ['data-keyboard'],
// We handle ESC ourselves
@@ -16,6 +15,14 @@ export default Ember.View.extend({
Em.run.next(() => $('.modal-header a.close').click());
}
});
+
+ this.appEvents.on('modal:body-shown', data => {
+ if (data.title) {
+ this.set('title', I18n.t(data.title));
+ } else if (data.rawTitle) {
+ this.set('title', data.rawTitle);
+ }
+ });
},
@on("willDestroyElement")
diff --git a/app/assets/javascripts/discourse/components/d-section.js.es6 b/app/assets/javascripts/discourse/components/d-section.js.es6
new file mode 100644
index 00000000000..41e044f95eb
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/d-section.js.es6
@@ -0,0 +1,39 @@
+import { scrollTop } from 'discourse/mixins/scroll-top';
+
+// Can add a body class from within a component, also will scroll to the top automatically.
+export default Ember.Component.extend({
+ tagName: 'section',
+
+ didInsertElement() {
+ this._super();
+
+ const pageClass = this.get('pageClass');
+ if (pageClass) {
+ $('body').addClass(`${pageClass}-page`);
+ }
+
+ const bodyClass = this.get('bodyClass');
+ if (bodyClass) {
+ $('body').addClass(bodyClass);
+ }
+
+ if (this.get('scrollTop') === "false") {
+ return;
+ }
+
+ scrollTop();
+ },
+
+ willDestroyElement() {
+ this._super();
+ const pageClass = this.get('pageClass');
+ if (pageClass) {
+ $('body').removeClass(`${pageClass}-page`);
+ }
+
+ const bodyClass = this.get('bodyClass');
+ if (bodyClass) {
+ $('body').removeClass(bodyClass);
+ }
+ }
+});
diff --git a/app/assets/javascripts/discourse/components/directory-toggle.js.es6 b/app/assets/javascripts/discourse/components/directory-toggle.js.es6
index f0e0192e178..3f55ec0543a 100644
--- a/app/assets/javascripts/discourse/components/directory-toggle.js.es6
+++ b/app/assets/javascripts/discourse/components/directory-toggle.js.es6
@@ -1,7 +1,7 @@
-import StringBuffer from 'discourse/mixins/string-buffer';
-import { iconHTML } from 'discourse/helpers/fa-icon';
+import { iconHTML } from 'discourse-common/helpers/fa-icon';
+import { bufferedRender } from 'discourse-common/lib/buffered-render';
-export default Ember.Component.extend(StringBuffer, {
+export default Ember.Component.extend(bufferedRender({
tagName: 'th',
classNames: ['sortable'],
attributeBindings: ['title'],
@@ -12,8 +12,7 @@ export default Ember.Component.extend(StringBuffer, {
return I18n.t(labelKey + '_long', { defaultValue: I18n.t(labelKey) });
}.property('field'),
- renderString(buffer) {
-
+ buildBuffer(buffer) {
const icon = this.get('icon');
if (icon) {
buffer.push(iconHTML(icon));
@@ -37,4 +36,4 @@ export default Ember.Component.extend(StringBuffer, {
this.setProperties({ order: field, asc: null });
}
}
-});
+}));
diff --git a/app/assets/javascripts/discourse/components/discourse-banner.js.es6 b/app/assets/javascripts/discourse/components/discourse-banner.js.es6
index 56374168e6c..40db3dce8ae 100644
--- a/app/assets/javascripts/discourse/components/discourse-banner.js.es6
+++ b/app/assets/javascripts/discourse/components/discourse-banner.js.es6
@@ -1,6 +1,4 @@
-import VisibleComponent from "discourse/components/visible";
-
-export default VisibleComponent.extend({
+export default Ember.Component.extend({
visible: function () {
var bannerKey = this.get("banner.key"),
@@ -14,7 +12,7 @@ export default VisibleComponent.extend({
}.property("user.dismissed_banner_key", "banner.key", "hide"),
actions: {
- dismiss: function () {
+ dismiss() {
if (this.get("user")) {
this.get("user").dismissBanner(this.get("banner.key"));
} else {
diff --git a/app/assets/javascripts/discourse/views/topic.js.es6 b/app/assets/javascripts/discourse/components/discourse-topic.js.es6
similarity index 68%
rename from app/assets/javascripts/discourse/views/topic.js.es6
rename to app/assets/javascripts/discourse/components/discourse-topic.js.es6
index d90420db520..17f40f3928b 100644
--- a/app/assets/javascripts/discourse/views/topic.js.es6
+++ b/app/assets/javascripts/discourse/components/discourse-topic.js.es6
@@ -1,15 +1,19 @@
-import AddCategoryClass from 'discourse/mixins/add-category-class';
import AddArchetypeClass from 'discourse/mixins/add-archetype-class';
import ClickTrack from 'discourse/lib/click-track';
import Scrolling from 'discourse/mixins/scrolling';
import { selectedText } from 'discourse/lib/utilities';
+import { observes } from 'ember-addons/ember-computed-decorators';
-const TopicView = Ember.View.extend(AddCategoryClass, AddArchetypeClass, Scrolling, {
- templateName: 'topic',
- topic: Ember.computed.alias('controller.model'),
+function highlight(postNumber) {
+ const $contents = $(`#post_${postNumber} .topic-body`);
+ $contents.addClass('highlighted');
+ $contents.on('animationend', () => $contents.removeClass('highlighted'));
+}
+
+export default Ember.Component.extend(AddArchetypeClass, Scrolling, {
userFilters: Ember.computed.alias('topic.userFilters'),
- classNameBindings: ['controller.multiSelect:multi-select',
+ classNameBindings: ['multiSelect',
'topic.archetype',
'topic.is_warning',
'topic.category.read_restricted:read_restricted',
@@ -18,31 +22,26 @@ const TopicView = Ember.View.extend(AddCategoryClass, AddArchetypeClass, Scrolli
menuVisible: true,
SHORT_POST: 1200,
- categoryFullSlug: Em.computed.alias('topic.category.fullSlug'),
- postStream: Em.computed.alias('topic.postStream'),
- archetype: Em.computed.alias('topic.archetype'),
+ postStream: Ember.computed.alias('topic.postStream'),
+ archetype: Ember.computed.alias('topic.archetype'),
_lastShowTopic: null,
- _composeChanged: function() {
- const composerController = Discourse.get('router.composerController');
- composerController.clearState();
- composerController.set('topic', this.get('topic'));
- }.observes('composer'),
-
- _enteredTopic: function() {
+ @observes('enteredAt')
+ _enteredTopic() {
// Ember is supposed to only call observers when values change but something
// in our view set up is firing this observer with the same value. This check
// prevents scrolled from being called twice.
- const enteredAt = this.get('controller.enteredAt');
+ const enteredAt = this.get('enteredAt');
if (enteredAt && (this.get('lastEnteredAt') !== enteredAt)) {
this._lastShowTopic = null;
this.scrolled();
this.set('lastEnteredAt', enteredAt);
}
- }.observes('controller.enteredAt'),
+ },
- _inserted: function() {
+ didInsertElement() {
+ this._super();
this.bindScrolling({name: 'topic-view'});
$(window).on('resize.discourse-on-scroll', () => this.scrolled());
@@ -65,10 +64,10 @@ const TopicView = Ember.View.extend(AddCategoryClass, AddArchetypeClass, Scrolli
this.appEvents.on('post:highlight', postNumber => {
Ember.run.scheduleOnce('afterRender', null, highlight, postNumber);
});
- }.on('didInsertElement'),
+ },
- // This view is being removed. Shut down operations
- _destroyed: function() {
+ willDestroyElement() {
+ this._super();
this.unbindScrolling('topic-view');
$(window).unbind('resize.discourse-on-scroll');
@@ -81,20 +80,18 @@ const TopicView = Ember.View.extend(AddCategoryClass, AddArchetypeClass, Scrolli
this.appEvents.trigger('header:hide-topic');
this.appEvents.off('post:highlight');
- }.on('willDestroyElement'),
+ },
- gotFocus: function() {
+ @observes('Discourse.hasFocus')
+ gotFocus() {
if (Discourse.get('hasFocus')){
this.scrolled();
}
- }.observes("Discourse.hasFocus"),
-
- resetExamineDockCache: function() {
- this.set('docAt', false);
},
- offset: 0,
- hasScrolled: Em.computed.gt("offset", 0),
+ resetExamineDockCache() {
+ this.set('docAt', false);
+ },
showTopicInHeader(topic, offset) {
if (this.get('docAt')) {
@@ -118,7 +115,7 @@ const TopicView = Ember.View.extend(AddCategoryClass, AddArchetypeClass, Scrolli
}
}
- this.set("offset", offset);
+ this.set('hasScrolled', offset > 0);
const topic = this.get('topic');
const showTopic = this.showTopicInHeader(topic, offset);
@@ -136,18 +133,3 @@ const TopicView = Ember.View.extend(AddCategoryClass, AddArchetypeClass, Scrolli
this.appEvents.trigger('topic:scrolled', offset);
}
});
-
-function highlight(postNumber) {
- const $contents = $(`#post_${postNumber} .topic-body`),
- origColor = $contents.data('orig-color') || $contents.css('backgroundColor');
-
- $contents.data("orig-color", origColor)
- .addClass('highlighted')
- .stop()
- .animate({ backgroundColor: origColor }, 2500, 'swing', function() {
- $contents.removeClass('highlighted');
- $contents.css({'background-color': ''});
- });
-}
-
-export default TopicView;
diff --git a/app/assets/javascripts/discourse/components/dropdown-button.js.es6 b/app/assets/javascripts/discourse/components/dropdown-button.js.es6
index 0037ec17f2a..032c80e2aff 100644
--- a/app/assets/javascripts/discourse/components/dropdown-button.js.es6
+++ b/app/assets/javascripts/discourse/components/dropdown-button.js.es6
@@ -1,6 +1,6 @@
-import StringBuffer from 'discourse/mixins/string-buffer';
+import { bufferedRender } from 'discourse-common/lib/buffered-render';
-export default Ember.Component.extend(StringBuffer, {
+export default Ember.Component.extend(bufferedRender({
classNameBindings: [':btn-group', 'hidden'],
rerenderTriggers: ['text', 'longDescription'],
@@ -23,7 +23,7 @@ export default Ember.Component.extend(StringBuffer, {
this.$().off('click.dropdown-button', 'ul li');
}.on('willDestroyElement'),
- renderString(buffer) {
+ buildBuffer(buffer) {
const title = this.get('title');
if (title) {
buffer.push("" + title + "
");
@@ -56,4 +56,4 @@ export default Ember.Component.extend(StringBuffer, {
buffer.push("");
}
}
-});
+}));
diff --git a/app/assets/javascripts/discourse/components/edit-category-images.js.es6 b/app/assets/javascripts/discourse/components/edit-category-images.js.es6
index 885ee5835b2..2aae9d52fff 100644
--- a/app/assets/javascripts/discourse/components/edit-category-images.js.es6
+++ b/app/assets/javascripts/discourse/components/edit-category-images.js.es6
@@ -1,2 +1,40 @@
import { buildCategoryPanel } from 'discourse/components/edit-category-panel';
-export default buildCategoryPanel('images');
+import { default as computed, observes } from 'ember-addons/ember-computed-decorators';
+
+export default buildCategoryPanel('images').extend({
+ @computed('category.uploaded_background.url')
+ backgroundImageUrl(uploadedBackgroundUrl) {
+ return uploadedBackgroundUrl || '';
+ },
+
+ @computed('category.uploaded_background.id')
+ backgroundImageId(uploadedBackgroundId) {
+ return uploadedBackgroundId || null;
+ },
+
+ @computed('category.uploaded_logo.url')
+ logoImageUrl(uploadedLogoUrl) {
+ return uploadedLogoUrl || '';
+ },
+
+ @computed('category.uploaded_logo.id')
+ logoImageId(uploadedLogoId) {
+ return uploadedLogoId || null;
+ },
+
+ @observes("backgroundImageUrl", "backgroundImageId")
+ _setBackgroundUpload() {
+ this.set("category.uploaded_background", Ember.Object.create({
+ id: this.get('backgroundImageId'),
+ url: this.get('backgroundImageUrl')
+ }));
+ },
+
+ @observes("logoImageUrl", "logoImageId")
+ _setLogoUpload() {
+ this.set("category.uploaded_logo", Ember.Object.create({
+ id: this.get('logoImageId'),
+ url: this.get('logoImageUrl')
+ }));
+ }
+});
diff --git a/app/assets/javascripts/discourse/components/edit-category-settings.js.es6 b/app/assets/javascripts/discourse/components/edit-category-settings.js.es6
index 049157609e3..41a4d2b20f5 100644
--- a/app/assets/javascripts/discourse/components/edit-category-settings.js.es6
+++ b/app/assets/javascripts/discourse/components/edit-category-settings.js.es6
@@ -1,7 +1,25 @@
import { setting } from 'discourse/lib/computed';
import { buildCategoryPanel } from 'discourse/components/edit-category-panel';
+import computed from "ember-addons/ember-computed-decorators";
export default buildCategoryPanel('settings', {
emailInEnabled: setting('email_in'),
showPositionInput: setting('fixed_category_positions'),
+
+ isDefaultSortOrder: Em.computed.empty('category.sort_order'),
+
+ @computed
+ availableSorts() {
+ return ['likes', 'op_likes', 'views', 'posts', 'activity', 'posters', 'category', 'created']
+ .map(s => ({ name: I18n.t('category.sort_options.' + s), value: s }))
+ .sort((a,b) => { return a.name > b.name; });
+ },
+
+ @computed
+ sortAscendingOptions() {
+ return [
+ {name: I18n.t('category.sort_ascending'), value: 'true'},
+ {name: I18n.t('category.sort_descending'), value: 'false'}
+ ];
+ }
});
diff --git a/app/assets/javascripts/discourse/components/edit-category-tab.js.es6 b/app/assets/javascripts/discourse/components/edit-category-tab.js.es6
index 9e470660675..556e072ea15 100644
--- a/app/assets/javascripts/discourse/components/edit-category-tab.js.es6
+++ b/app/assets/javascripts/discourse/components/edit-category-tab.js.es6
@@ -14,9 +14,14 @@ export default Em.Component.extend({
return I18n.t('category.' + this.get('tab').replace('-', '_'));
}.property('tab'),
+ didInsertElement() {
+ this._super();
+ Ember.run.scheduleOnce('afterRender', this, this._addToCollection);
+ },
+
_addToCollection: function() {
this.get('panels').addObject(this.get('tabClassName'));
- }.on('didInsertElement'),
+ },
actions: {
select: function() {
diff --git a/app/assets/javascripts/discourse/components/emoji-uploader.js.es6 b/app/assets/javascripts/discourse/components/emoji-uploader.js.es6
index b43bea04103..0afeb1a239c 100644
--- a/app/assets/javascripts/discourse/components/emoji-uploader.js.es6
+++ b/app/assets/javascripts/discourse/components/emoji-uploader.js.es6
@@ -11,6 +11,10 @@ export default Em.Component.extend(UploadMixin, {
return Ember.isBlank(this.get("name")) ? {} : { name: this.get("name") };
}.property("name"),
+ validateUploadedFilesOptions() {
+ return { imagesOnly: true };
+ },
+
uploadDone(upload) {
this.set("name", null);
this.sendAction("done", upload);
diff --git a/app/assets/javascripts/discourse/components/featured-topic.js.es6 b/app/assets/javascripts/discourse/components/featured-topic.js.es6
index def196f7a1d..f000172e6a5 100644
--- a/app/assets/javascripts/discourse/components/featured-topic.js.es6
+++ b/app/assets/javascripts/discourse/components/featured-topic.js.es6
@@ -4,7 +4,7 @@ export default Ember.Component.extend({
click(e) {
const $target = $(e.target);
if ($target.closest('.last-posted-at').length) {
- this.sendAction('action', {topic: this.get('topic'), position: $target.offset()});
+ this.appEvents.trigger('topic-entrance:show', {topic: this.get('topic'), position: $target.offset()});
return false;
}
}
diff --git a/app/assets/javascripts/discourse/components/flag-action-type.js.es6 b/app/assets/javascripts/discourse/components/flag-action-type.js.es6
index 031831219c3..377f2129c97 100644
--- a/app/assets/javascripts/discourse/components/flag-action-type.js.es6
+++ b/app/assets/javascripts/discourse/components/flag-action-type.js.es6
@@ -36,12 +36,12 @@ export default Ember.Component.extend({
const len = messageLength || 0;
const minLen = Discourse.SiteSettings.min_private_message_post_length;
if (len === 0) {
- return I18n.t("flagging.custom_message.at_least", { n: minLen });
+ return I18n.t("flagging.custom_message.at_least", { count: minLen });
} else if (len < minLen) {
- return I18n.t("flagging.custom_message.more", { n: minLen - len });
+ return I18n.t("flagging.custom_message.more", { count: minLen - len });
} else {
return I18n.t("flagging.custom_message.left", {
- n: MAX_MESSAGE_LENGTH - len
+ count: MAX_MESSAGE_LENGTH - len
});
}
},
diff --git a/app/assets/javascripts/discourse/components/flag-selection.js.es6 b/app/assets/javascripts/discourse/components/flag-selection.js.es6
new file mode 100644
index 00000000000..b738e2c169d
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/flag-selection.js.es6
@@ -0,0 +1,18 @@
+import { observes } from 'ember-addons/ember-computed-decorators';
+
+// Mostly hacks because `flag.hbs` didn't use `radio-button`
+export default Ember.Component.extend({
+ _selectRadio() {
+ this.$("input[type='radio']").prop('checked', false);
+
+ const nameKey = this.get('nameKey');
+ if (!nameKey) { return; }
+
+ this.$('#radio_' + nameKey).prop('checked', 'true');
+ },
+
+ @observes('nameKey')
+ selectedChanged() {
+ Ember.run.next(this, this._selectRadio);
+ }
+});
diff --git a/app/assets/javascripts/discourse/components/generated-invite-link.js.es6 b/app/assets/javascripts/discourse/components/generated-invite-link.js.es6
new file mode 100644
index 00000000000..be1c34fb3d2
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/generated-invite-link.js.es6
@@ -0,0 +1,6 @@
+export default Ember.Component.extend({
+ didInsertElement() {
+ this._super();
+ this.$('input').select().focus();
+ }
+});
diff --git a/app/assets/javascripts/discourse/components/global-notice.js.es6 b/app/assets/javascripts/discourse/components/global-notice.js.es6
index 13994f28fbf..d3ae4235484 100644
--- a/app/assets/javascripts/discourse/components/global-notice.js.es6
+++ b/app/assets/javascripts/discourse/components/global-notice.js.es6
@@ -1,14 +1,18 @@
import { on } from 'ember-addons/ember-computed-decorators';
-import StringBuffer from 'discourse/mixins/string-buffer';
-import { iconHTML } from 'discourse/helpers/fa-icon';
+import { iconHTML } from 'discourse-common/helpers/fa-icon';
import LogsNotice from 'discourse/services/logs-notice';
+import { bufferedRender } from 'discourse-common/lib/buffered-render';
-export default Ember.Component.extend(StringBuffer, {
+export default Ember.Component.extend(bufferedRender({
rerenderTriggers: ['site.isReadOnly'],
- renderString: function(buffer) {
+ buildBuffer(buffer) {
let notices = [];
+ if (this.session.get('safe_mode')) {
+ notices.push([I18n.t("safe_mode.enabled"), 'safe-mode']);
+ }
+
if (this.site.get("isReadOnly")) {
notices.push([I18n.t("read_only_mode.enabled"), 'alert-read-only']);
}
@@ -17,6 +21,11 @@ export default Ember.Component.extend(StringBuffer, {
notices.push([I18n.t("emails_are_disabled"), 'alert-emails-disabled']);
}
+ if (this.site.get('wizard_required')) {
+ const requiredText = I18n.t('wizard_required', {url: Discourse.getURL('/wizard')});
+ notices.push([requiredText, 'alert-wizard']);
+ }
+
if (this.currentUser && this.currentUser.get('staff') && this.siteSettings.bootstrap_mode_enabled) {
if (this.siteSettings.bootstrap_mode_min_users > 0) {
notices.push([I18n.t("bootstrap_mode_enabled", {min_users: this.siteSettings.bootstrap_mode_min_users}), 'alert-bootstrap-mode']);
@@ -46,7 +55,7 @@ export default Ember.Component.extend(StringBuffer, {
@on('didInsertElement')
_setupLogsNotice() {
LogsNotice.current().addObserver('hidden', () => {
- this.rerenderString();
+ this.rerenderBuffer();
});
this.$().on('click.global-notice', '.alert-logs-notice .close', () => {
@@ -58,4 +67,4 @@ export default Ember.Component.extend(StringBuffer, {
_teardownLogsNotice() {
this.$().off('click.global-notice');
}
-});
+}));
diff --git a/app/assets/javascripts/discourse/components/group-flair-inputs.js.es6 b/app/assets/javascripts/discourse/components/group-flair-inputs.js.es6
new file mode 100644
index 00000000000..ce4113450b3
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/group-flair-inputs.js.es6
@@ -0,0 +1,50 @@
+import computed from 'ember-addons/ember-computed-decorators';
+import { escapeExpression } from 'discourse/lib/utilities';
+
+export default Ember.Component.extend({
+
+ classNames: ['group-flair-inputs'],
+
+ @computed
+ demoAvatarUrl() {
+ return Discourse.getURL('/images/avatar.png');
+ },
+
+ @computed('model.flair_url')
+ flairPreviewIcon(flairURL) {
+ return flairURL && flairURL.substr(0,3) === 'fa-';
+ },
+
+ @computed('model.flair_url', 'flairPreviewIcon')
+ flairPreviewImage(flairURL, flairPreviewIcon) {
+ return flairURL && !flairPreviewIcon;
+ },
+
+ @computed('model.flair_url', 'flairPreviewImage', 'model.flairBackgroundHexColor', 'model.flairHexColor')
+ flairPreviewStyle(flairURL, flairPreviewImage, flairBackgroundHexColor, flairHexColor) {
+ let style = '';
+
+ if (flairPreviewImage) {
+ style += `background-image: url(${escapeExpression(flairURL)});`;
+ }
+
+ if (flairBackgroundHexColor) {
+ style += `background-color: #${flairBackgroundHexColor};`;
+ }
+
+ if (flairHexColor) style += `color: #${flairHexColor};`;
+
+ return style;
+ },
+
+ @computed('model.flairBackgroundHexColor')
+ flairPreviewClasses(flairBackgroundHexColor) {
+ if (flairBackgroundHexColor) return 'rounded';
+ },
+
+ @computed('flairPreviewImage')
+ flairPreviewLabel(flairPreviewImage) {
+ const key = flairPreviewImage ? 'image' : 'icon';
+ return I18n.t(`groups.flair_preview_${key}`);
+ }
+});
diff --git a/app/assets/javascripts/discourse/components/group-index-toggle.js.es6 b/app/assets/javascripts/discourse/components/group-index-toggle.js.es6
new file mode 100644
index 00000000000..fb7c9d24c50
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/group-index-toggle.js.es6
@@ -0,0 +1,24 @@
+import { iconHTML } from 'discourse-common/helpers/fa-icon';
+import { bufferedRender } from 'discourse-common/lib/buffered-render';
+
+export default Ember.Component.extend(bufferedRender({
+ tagName: 'th',
+ classNames: ['sortable'],
+ rerenderTriggers: ['order', 'desc'],
+
+ buildBuffer(buffer) {
+ buffer.push(I18n.t(this.get('i18nKey')));
+
+ if (this.get('field') === this.get('order')) {
+ buffer.push(iconHTML(this.get('desc') ? 'chevron-down' : 'chevron-up'));
+ }
+ },
+
+ click() {
+ if (this.get('order') === this.field) {
+ this.set('desc', this.get('desc') ? null : true);
+ } else {
+ this.setProperties({ order: this.field, desc: null });
+ }
+ }
+}));
diff --git a/app/assets/javascripts/discourse/components/group-logs-filter.js.es6 b/app/assets/javascripts/discourse/components/group-logs-filter.js.es6
new file mode 100644
index 00000000000..ba4ccc3f742
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/group-logs-filter.js.es6
@@ -0,0 +1,21 @@
+import computed from 'ember-addons/ember-computed-decorators';
+
+export default Ember.Component.extend({
+ tagName: '',
+
+ @computed('type')
+ label(type) {
+ return I18n.t(`groups.logs.${type}`);
+ },
+
+ @computed('value', 'type')
+ filterText(value, type) {
+ return type === 'action' ? I18n.t(`group_histories.actions.${value}`) : value;
+ },
+
+ actions: {
+ clearFilter(param) {
+ this.sendAction("clearFilter", param);
+ }
+ }
+});
diff --git a/app/assets/javascripts/discourse/components/group-logs-row.js.es6 b/app/assets/javascripts/discourse/components/group-logs-row.js.es6
new file mode 100644
index 00000000000..5b46af4d61d
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/group-logs-row.js.es6
@@ -0,0 +1,14 @@
+export default Ember.Component.extend({
+ tagName: '',
+ expandDetails: false,
+
+ actions: {
+ toggleDetails() {
+ this.toggleProperty('expandDetails');
+ },
+
+ filter(params) {
+ this.set(`filters.${params.key}`, params.value);
+ }
+ }
+});
diff --git a/app/assets/javascripts/admin/components/group-member.js.es6 b/app/assets/javascripts/discourse/components/group-member.js.es6
similarity index 100%
rename from app/assets/javascripts/admin/components/group-member.js.es6
rename to app/assets/javascripts/discourse/components/group-member.js.es6
diff --git a/app/assets/javascripts/discourse/components/group-members-input.js.es6 b/app/assets/javascripts/discourse/components/group-members-input.js.es6
new file mode 100644
index 00000000000..1fb45f27bf6
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/group-members-input.js.es6
@@ -0,0 +1,69 @@
+import computed from 'ember-addons/ember-computed-decorators';
+import { popupAjaxError } from 'discourse/lib/ajax-error';
+import { propertyEqual } from 'discourse/lib/computed';
+
+export default Ember.Component.extend({
+ classNames: ["group-members-input"],
+
+ @computed('model.limit', 'model.offset', 'model.user_count')
+ currentPage(limit, offset, userCount) {
+ if (userCount === 0) { return 0; }
+
+ return Math.floor(offset / limit) + 1;
+ },
+
+ @computed('model.limit', 'model.user_count')
+ totalPages(limit, userCount) {
+ if (userCount === 0) { return 0; }
+ return Math.floor(userCount / limit) + 1;
+ },
+
+ @computed('model.usernames')
+ disableAddButton(usernames) {
+ return !usernames || !(usernames.length > 0);
+ },
+
+ showingFirst: Em.computed.lte("currentPage", 1),
+ showingLast: propertyEqual("currentPage", "totalPages"),
+
+ actions: {
+ next() {
+ if (this.get("showingLast")) { return; }
+
+ const group = this.get("model");
+ const offset = Math.min(group.get("offset") + group.get("limit"), group.get("user_count"));
+ group.set("offset", offset);
+
+ return group.findMembers();
+ },
+
+ previous() {
+ if (this.get("showingFirst")) { return; }
+
+ const group = this.get("model");
+ const offset = Math.max(group.get("offset") - group.get("limit"), 0);
+ group.set("offset", offset);
+
+ return group.findMembers();
+ },
+
+ addMembers() {
+ if (Em.isEmpty(this.get("model.usernames"))) { return; }
+ this.get("model").addMembers(this.get("model.usernames")).catch(popupAjaxError);
+ this.set("model.usernames", null);
+ },
+
+ removeMember(member) {
+ const message = I18n.t("groups.edit.delete_member_confirm",{
+ username: member.get("username"),
+ group: this.get("model.name")
+ });
+
+ return bootbox.confirm(message, I18n.t("no_value"), I18n.t("yes_value"), confirm => {
+ if (confirm) {
+ this.get("model").removeMember(member);
+ }
+ });
+ }
+ }
+});
diff --git a/app/assets/javascripts/discourse/components/group-membership-button.js.es6 b/app/assets/javascripts/discourse/components/group-membership-button.js.es6
new file mode 100644
index 00000000000..dba83c69dc2
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/group-membership-button.js.es6
@@ -0,0 +1,73 @@
+import { default as computed } from 'ember-addons/ember-computed-decorators';
+import { popupAjaxError } from 'discourse/lib/ajax-error';
+import Group from 'discourse/models/group';
+
+export default Ember.Component.extend({
+ @computed("model.public")
+ canJoinGroup(publicGroup) {
+ return publicGroup;
+ },
+
+ @computed('model.allow_membership_requests', 'model.alias_level')
+ canRequestMembership(allowMembershipRequests, aliasLevel) {
+ return allowMembershipRequests && aliasLevel === 99;
+ },
+
+ @computed("model.is_group_user", "model.id", "groupUserIds")
+ userIsGroupUser(isGroupUser, groupId, groupUserIds) {
+ if (isGroupUser) {
+ return isGroupUser;
+ } else {
+ return !!groupUserIds && groupUserIds.includes(groupId);
+ }
+ },
+
+ @computed
+ joinGroupAction() {
+ return this.currentUser ? 'joinGroup' : 'showLogin';
+ },
+
+ @computed
+ requestMembershipAction() {
+ return this.currentUser ? 'requestMembership' : 'showLogin';
+ },
+
+ actions: {
+ showLogin() {
+ this.sendAction('showLogin');
+ },
+
+ joinGroup() {
+ this.set('updatingMembership', true);
+ const model = this.get('model');
+
+ model.addMembers(this.currentUser.get('username')).then(() => {
+ model.set('is_group_user', true);
+ }).catch(popupAjaxError).finally(() => {
+ this.set('updatingMembership', false);
+ });
+ },
+
+ leaveGroup() {
+ this.set('updatingMembership', true);
+ const model = this.get('model');
+
+ model.removeMember(this.currentUser).then(() => {
+ model.set('is_group_user', false);
+ }).catch(popupAjaxError).finally(() => {
+ this.set('updatingMembership', false);
+ });
+ },
+
+ requestMembership() {
+ const groupName = this.get('model.name');
+
+ Group.loadOwners(groupName).then(result => {
+ const names = result.map(owner => owner.username).join(",");
+ const title = I18n.t('groups.request_membership_pm.title');
+ const body = I18n.t('groups.request_membership_pm.body', { groupName });
+ this.sendAction("createNewMessageViaParams", names, title, body);
+ });
+ }
+ }
+});
diff --git a/app/assets/javascripts/discourse/components/group-notifications-button.js.es6 b/app/assets/javascripts/discourse/components/group-notifications-button.js.es6
index 6010cf02a25..8f70ca102a3 100644
--- a/app/assets/javascripts/discourse/components/group-notifications-button.js.es6
+++ b/app/assets/javascripts/discourse/components/group-notifications-button.js.es6
@@ -2,7 +2,7 @@ import NotificationsButton from 'discourse/components/notifications-button';
export default NotificationsButton.extend({
classNames: ['notification-options', 'group-notification-menu'],
- notificationLevel: Em.computed.alias('group.notification_level'),
+ notificationLevel: Em.computed.alias('group.group_user.notification_level'),
i18nPrefix: 'groups.notifications',
clicked(id) {
diff --git a/app/assets/javascripts/discourse/components/group-selector.js.es6 b/app/assets/javascripts/discourse/components/group-selector.js.es6
index dc23f0f1e41..4beb5a3a932 100644
--- a/app/assets/javascripts/discourse/components/group-selector.js.es6
+++ b/app/assets/javascripts/discourse/components/group-selector.js.es6
@@ -1,15 +1,29 @@
-export default Ember.Component.extend({
- placeholder: function(){
- return I18n.t(this.get("placeholderKey"));
- }.property("placeholderKey"),
+import { on, observes, default as computed } from 'ember-addons/ember-computed-decorators';
+import { findRawTemplate } from 'discourse/lib/raw-templates';
- _initializeAutocomplete: function() {
+export default Ember.Component.extend({
+ @computed('placeholderKey')
+ placeholder(placeholderKey) {
+ return placeholderKey ? I18n.t(placeholderKey) : '';
+ },
+
+ @observes('groupNames')
+ _update() {
+ if (this.get('canReceiveUpdates') === 'true')
+ this._initializeAutocomplete({updateData: true});
+ },
+
+ @on('didInsertElement')
+ _initializeAutocomplete(opts) {
var self = this;
var selectedGroups;
+ var groupNames = this.get('groupNames');
- var template = this.container.lookup('template:group-selector-autocomplete.raw');
self.$('input').autocomplete({
allowAny: false,
+ items: _.isArray(groupNames) ? groupNames : (Ember.isEmpty(groupNames)) ? [] : [groupNames],
+ single: this.get('single'),
+ updateData: (opts && opts.updateData) ? opts.updateData : false,
onChangeItems: function(items){
selectedGroups = items;
self.set("groupNames", items.join(","));
@@ -29,7 +43,7 @@ export default Ember.Component.extend({
});
});
},
- template: template
+ template: findRawTemplate('group-selector-autocomplete')
});
- }.on('didInsertElement')
+ }
});
diff --git a/app/assets/javascripts/discourse/components/header-extra-info.js.es6 b/app/assets/javascripts/discourse/components/header-extra-info.js.es6
index 66aaf82cb91..1d769faa090 100644
--- a/app/assets/javascripts/discourse/components/header-extra-info.js.es6
+++ b/app/assets/javascripts/discourse/components/header-extra-info.js.es6
@@ -1,3 +1,5 @@
+import deprecated from 'discourse-common/lib/deprecated';
+
export function needsSecondRowIf() {
- Ember.warn("DEPRECATION: `needsSecondRowIf` is deprecated. Use widget hooks on `header-second-row`");
+ deprecated("`needsSecondRowIf` is deprecated. Use widget hooks on `header-second-row`");
}
diff --git a/app/assets/javascripts/discourse/components/hide-modal-trigger.js.es6 b/app/assets/javascripts/discourse/components/hide-modal-trigger.js.es6
new file mode 100644
index 00000000000..0db92cc4617
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/hide-modal-trigger.js.es6
@@ -0,0 +1,6 @@
+export default Ember.Component.extend({
+ didInsertElement() {
+ this._super();
+ $('#discourse-modal').modal('hide');
+ }
+});
diff --git a/app/assets/javascripts/discourse/components/image-uploader.js.es6 b/app/assets/javascripts/discourse/components/image-uploader.js.es6
index 08359fa8695..642ba03b3e8 100644
--- a/app/assets/javascripts/discourse/components/image-uploader.js.es6
+++ b/app/assets/javascripts/discourse/components/image-uploader.js.es6
@@ -6,17 +6,23 @@ export default Em.Component.extend(UploadMixin, {
@computed('imageUrl')
backgroundStyle(imageUrl) {
- if (Em.isNone(imageUrl)) { return; }
+ if (Em.isNone(imageUrl)) { return "".htmlSafe(); }
return `background-image: url(${imageUrl})`.htmlSafe();
},
+ validateUploadedFilesOptions() {
+ return { imagesOnly: true };
+ },
+
uploadDone(upload) {
this.set("imageUrl", upload.url);
+ this.set("imageId", upload.id);
},
actions: {
trash() {
this.set("imageUrl", null);
+ this.set("imageId", null);
}
}
});
diff --git a/app/assets/javascripts/discourse/components/input-tip.js.es6 b/app/assets/javascripts/discourse/components/input-tip.js.es6
index 2ba1c074c4e..0178ad7cac5 100644
--- a/app/assets/javascripts/discourse/components/input-tip.js.es6
+++ b/app/assets/javascripts/discourse/components/input-tip.js.es6
@@ -1,17 +1,17 @@
-import StringBuffer from 'discourse/mixins/string-buffer';
-import { iconHTML } from 'discourse/helpers/fa-icon';
+import { bufferedRender } from 'discourse-common/lib/buffered-render';
+import { iconHTML } from 'discourse-common/helpers/fa-icon';
-export default Ember.Component.extend(StringBuffer, {
+export default Ember.Component.extend(bufferedRender({
classNameBindings: [':tip', 'good', 'bad'],
rerenderTriggers: ['validation'],
bad: Em.computed.alias('validation.failed'),
good: Em.computed.not('bad'),
- renderString(buffer) {
+ buildBuffer(buffer) {
const reason = this.get('validation.reason');
if (reason) {
buffer.push(iconHTML(this.get('good') ? 'check' : 'times') + ' ' + reason);
}
}
-});
+}));
diff --git a/app/assets/javascripts/discourse/components/latest-topic-list-item.js.es6 b/app/assets/javascripts/discourse/components/latest-topic-list-item.js.es6
new file mode 100644
index 00000000000..07a4c53b2f5
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/latest-topic-list-item.js.es6
@@ -0,0 +1,6 @@
+import { showEntrance } from "discourse/components/topic-list-item";
+
+export default Ember.Component.extend({
+ tagName: "tr",
+ click: showEntrance,
+});
diff --git a/app/assets/javascripts/discourse/views/history.js.es6 b/app/assets/javascripts/discourse/components/links-redirect.js.es6
similarity index 57%
rename from app/assets/javascripts/discourse/views/history.js.es6
rename to app/assets/javascripts/discourse/components/links-redirect.js.es6
index 0f97a977277..4862b953ad7 100644
--- a/app/assets/javascripts/discourse/views/history.js.es6
+++ b/app/assets/javascripts/discourse/components/links-redirect.js.es6
@@ -1,17 +1,10 @@
-import ModalBodyView from "discourse/views/modal-body";
import ClickTrack from 'discourse/lib/click-track';
import { selectedText } from 'discourse/lib/utilities';
-export default ModalBodyView.extend({
- templateName: 'modal/history',
- title: I18n.t('history'),
+export default Ember.Component.extend({
+ didInsertElement() {
+ this._super();
- resizeModal: function(){
- const viewPortHeight = $(window).height();
- this.$(".modal-body").css("max-height", Math.floor(0.8 * viewPortHeight) + "px");
- }.on("didInsertElement"),
-
- _inserted: function() {
this.$().on('mouseup.discourse-redirect', '#revisions a', function(e) {
// bypass if we are selecting stuff
const selection = window.getSelection && window.getSelection();
@@ -26,11 +19,10 @@ export default ModalBodyView.extend({
return ClickTrack.trackClick(e);
});
+ },
- }.on('didInsertElement'),
-
- // This view is being removed. Shut down operations
- _destroyed: function() {
+ willDestroyElement() {
+ this._super();
this.$().off('mouseup.discourse-redirect', '#revisions a');
- }.on('willDestroyElement')
+ }
});
diff --git a/app/assets/javascripts/discourse/components/login-buttons.js.es6 b/app/assets/javascripts/discourse/components/login-buttons.js.es6
index ccaabff239f..4c68d1740f2 100644
--- a/app/assets/javascripts/discourse/components/login-buttons.js.es6
+++ b/app/assets/javascripts/discourse/components/login-buttons.js.es6
@@ -1,4 +1,5 @@
import { findAll } from 'discourse/models/login-method';
+import computed from 'ember-addons/ember-computed-decorators';
export default Ember.Component.extend({
elementId: 'login-buttons',
@@ -6,9 +7,10 @@ export default Ember.Component.extend({
hidden: Ember.computed.equal('buttons.length', 0),
- buttons: function() {
- return findAll(this.siteSettings);
- }.property(),
+ @computed
+ buttons() {
+ return findAll(this.siteSettings, this.capabilities, this.site.isMobileDevice);
+ },
actions: {
externalLogin: function(provider) {
diff --git a/app/assets/javascripts/discourse/components/login-modal.js.es6 b/app/assets/javascripts/discourse/components/login-modal.js.es6
new file mode 100644
index 00000000000..e366392b342
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/login-modal.js.es6
@@ -0,0 +1,26 @@
+export default Ember.Component.extend({
+ didInsertElement() {
+ this._super();
+
+ const prefillUsername = $('#hidden-login-form input[name=username]').val();
+ if (prefillUsername) {
+ this.set('loginName', prefillUsername);
+ this.set('loginPassword', $('#hidden-login-form input[name=password]').val());
+ } else if ($.cookie('email')) {
+ this.set('loginName', $.cookie('email'));
+ }
+
+ Ember.run.schedule('afterRender', () => {
+ $('#login-account-password, #login-account-name').keydown(e => {
+ if (e.keyCode === 13) {
+ this.sendAction();
+ }
+ });
+ });
+ },
+
+ mouseMove(e) {
+ this.set('screenX', e.screenX);
+ this.set('screenY', e.screenY);
+ }
+});
diff --git a/app/assets/javascripts/discourse/components/login-reply-button.js.es6 b/app/assets/javascripts/discourse/components/login-reply-button.js.es6
new file mode 100644
index 00000000000..e162faf2673
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/login-reply-button.js.es6
@@ -0,0 +1,7 @@
+import Button from 'discourse/components/d-button';
+
+export default Button.extend({
+ label: 'topic.reply.title',
+ icon: 'reply',
+ action: 'showLogin'
+});
diff --git a/app/assets/javascripts/discourse/components/mobile-nav.js.es6 b/app/assets/javascripts/discourse/components/mobile-nav.js.es6
index cee8a2111aa..deccf48ef2d 100644
--- a/app/assets/javascripts/discourse/components/mobile-nav.js.es6
+++ b/app/assets/javascripts/discourse/components/mobile-nav.js.es6
@@ -14,6 +14,7 @@ export default Ember.Component.extend({
},
tagName: 'ul',
+ selectedHtml: null,
classNames: ['mobile-nav'],
diff --git a/app/assets/javascripts/discourse/components/mount-widget.js.es6 b/app/assets/javascripts/discourse/components/mount-widget.js.es6
index e62390e6940..3c41721fe63 100644
--- a/app/assets/javascripts/discourse/components/mount-widget.js.es6
+++ b/app/assets/javascripts/discourse/components/mount-widget.js.es6
@@ -2,6 +2,7 @@ import { keyDirty } from 'discourse/widgets/widget';
import { diff, patch } from 'virtual-dom';
import { WidgetClickHook } from 'discourse/widgets/hooks';
import { renderedKey, queryRegistry } from 'discourse/widgets/widget';
+import { getRegister } from 'discourse-common/lib/get-owner';
const _cleanCallbacks = {};
export function addWidgetCleanCallback(widgetName, fn) {
@@ -22,9 +23,9 @@ export default Ember.Component.extend({
this._super();
const name = this.get('widget');
- (this.get('delegated') || []).forEach(m => this.set(m, m));
+ this.register = getRegister(this);
- this._widgetClass = queryRegistry(name) || this.container.lookupFactory(`widget:${name}`);
+ this._widgetClass = queryRegistry(name) || this.register.lookupFactory(`widget:${name}`);
if (!this._widgetClass) {
console.error(`Error: Could not find widget: ${name}`);
@@ -97,14 +98,16 @@ export default Ember.Component.extend({
rerenderWidget() {
Ember.run.cancel(this._timeout);
+
if (this._rootNode) {
if (!this._widgetClass) { return; }
const t0 = new Date().getTime();
const args = this.get('args') || this.buildArgs();
const opts = { model: this.get('model') };
- const newTree = new this._widgetClass(args, this.container, opts);
+ const newTree = new this._widgetClass(args, this.register, opts);
+ newTree._rerenderable = this;
newTree._emberView = this;
const patches = diff(this._tree || this._rootNode, newTree);
diff --git a/app/assets/javascripts/discourse/components/nav-item.js.es6 b/app/assets/javascripts/discourse/components/nav-item.js.es6
index 69c797bd309..3a4b40dddf1 100644
--- a/app/assets/javascripts/discourse/components/nav-item.js.es6
+++ b/app/assets/javascripts/discourse/components/nav-item.js.es6
@@ -1,6 +1,7 @@
/* You might be looking for navigation-item. */
import computed from "ember-addons/ember-computed-decorators";
+import { getOwner } from 'discourse-common/lib/get-owner';
export default Ember.Component.extend({
tagName: 'li',
@@ -8,7 +9,7 @@ export default Ember.Component.extend({
@computed()
router() {
- return this.container.lookup('router:main');
+ return getOwner(this).lookup('router:main');
},
@computed("path")
diff --git a/app/assets/javascripts/discourse/components/navigation-item.js.es6 b/app/assets/javascripts/discourse/components/navigation-item.js.es6
index 758e4a385cd..62f6a37fdef 100644
--- a/app/assets/javascripts/discourse/components/navigation-item.js.es6
+++ b/app/assets/javascripts/discourse/components/navigation-item.js.es6
@@ -1,7 +1,7 @@
import computed from "ember-addons/ember-computed-decorators";
-import StringBuffer from 'discourse/mixins/string-buffer';
+import { bufferedRender } from 'discourse-common/lib/buffered-render';
-export default Ember.Component.extend(StringBuffer, {
+export default Ember.Component.extend(bufferedRender({
tagName: 'li',
classNameBindings: ['active', 'content.hasIcon:has-icon'],
attributeBindings: ['title'],
@@ -26,7 +26,7 @@ export default Ember.Component.extend(StringBuffer, {
filterMode.indexOf(contentFilterMode) === 0;
},
- renderString(buffer) {
+ buildBuffer(buffer) {
const content = this.get('content');
buffer.push("");
if (content.get('hasIcon')) {
@@ -35,4 +35,4 @@ export default Ember.Component.extend(StringBuffer, {
buffer.push(this.get('content.displayName'));
buffer.push("");
}
-});
+}));
diff --git a/app/assets/javascripts/discourse/components/notifications-button.js.es6 b/app/assets/javascripts/discourse/components/notifications-button.js.es6
index 8a3ffda21e2..2695cfc9186 100644
--- a/app/assets/javascripts/discourse/components/notifications-button.js.es6
+++ b/app/assets/javascripts/discourse/components/notifications-button.js.es6
@@ -1,6 +1,6 @@
import DropdownButton from 'discourse/components/dropdown-button';
import { allLevels, buttonDetails } from 'discourse/lib/notification-levels';
-import { iconHTML } from 'discourse/helpers/fa-icon';
+import { iconHTML } from 'discourse-common/helpers/fa-icon';
import computed from 'ember-addons/ember-computed-decorators';
export default DropdownButton.extend({
diff --git a/app/assets/javascripts/discourse/components/period-chooser.js.es6 b/app/assets/javascripts/discourse/components/period-chooser.js.es6
index 1bbf20c03ca..efd7e157202 100644
--- a/app/assets/javascripts/discourse/components/period-chooser.js.es6
+++ b/app/assets/javascripts/discourse/components/period-chooser.js.es6
@@ -24,8 +24,12 @@ export default Ember.Component.extend(CleansUp, {
if ($(e.target).closest('.period-popup').length) { return; }
if (!this.get('showPeriods')) {
- const $chevron = this.$('i.fa-caret-down');
- this.$('#period-popup').css($chevron.position());
+ if (!this.site.mobileView) {
+ const $chevron = this.$('i.fa-caret-down');
+ this.$('#period-popup').css($chevron.position());
+ } else {
+ this.$('#period-popup').css({top: this.$().height()});
+ }
this.set('showPeriods', true);
this._clickToClose();
}
diff --git a/app/assets/javascripts/discourse/components/plugin-connector.js.es6 b/app/assets/javascripts/discourse/components/plugin-connector.js.es6
new file mode 100644
index 00000000000..564ab139e72
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/plugin-connector.js.es6
@@ -0,0 +1,30 @@
+import { observes } from 'ember-addons/ember-computed-decorators';
+
+export default Ember.Component.extend({
+
+ init() {
+ this._super();
+
+ const connector = this.get('connector');
+ this.set('layoutName', connector.templateName);
+
+ const args = this.get('args') || {};
+ Object.keys(args).forEach(key => this.set(key, args[key]));
+
+ const connectorClass = this.get('connector.connectorClass');
+ connectorClass.setupComponent.call(this, args, this);
+ },
+
+ @observes('args')
+ _argsChanged() {
+ const args = this.get('args') || {};
+ Object.keys(args).forEach(key => this.set(key, args[key]));
+ },
+
+ send(name, ...args) {
+ const connectorClass = this.get('connector.connectorClass');
+ const action = connectorClass.actions[name];
+ return action ? action.call(this, ...args) : this._super(name, ...args);
+ }
+
+});
diff --git a/app/assets/javascripts/discourse/components/plugin-outlet.js.es6 b/app/assets/javascripts/discourse/components/plugin-outlet.js.es6
new file mode 100644
index 00000000000..91bf45560e9
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/plugin-outlet.js.es6
@@ -0,0 +1,51 @@
+/**
+ A plugin outlet is an extension point for templates where other templates can
+ be inserted by plugins.
+
+ ## Usage
+
+ If your handlebars template has:
+
+ ```handlebars
+ {{plugin-outlet name="evil-trout"}}
+ ```
+
+ Then any handlebars files you create in the `connectors/evil-trout` directory
+ will automatically be appended. For example:
+
+ plugins/hello/assets/javascripts/discourse/templates/connectors/evil-trout/hello.hbs
+
+ With the contents:
+
+ ```handlebars
+ Hello World
+ ```
+
+ Will insert Hello World at that point in the template.
+
+ ## Disabling
+
+ If a plugin returns a disabled status, the outlets will not be wired up for it.
+ The list of disabled plugins is returned via the `Site` singleton.
+
+**/
+import { connectorsFor } from 'discourse/lib/plugin-connectors';
+
+export default Ember.Component.extend({
+ tagName: 'span',
+ connectors: null,
+
+ init() {
+ this._super();
+ const name = this.get('name');
+
+ if (name) {
+ const args = this.get('args');
+ const connectors = connectorsFor(name).filter(con => {
+ return con.connectorClass.shouldRender(args, this);
+ });
+
+ this.set('connectors', connectors);
+ }
+ }
+});
diff --git a/app/assets/javascripts/discourse/components/popup-input-tip.js.es6 b/app/assets/javascripts/discourse/components/popup-input-tip.js.es6
index c63997674c9..59e5856db09 100644
--- a/app/assets/javascripts/discourse/components/popup-input-tip.js.es6
+++ b/app/assets/javascripts/discourse/components/popup-input-tip.js.es6
@@ -1,8 +1,8 @@
-import StringBuffer from 'discourse/mixins/string-buffer';
-import { iconHTML } from 'discourse/helpers/fa-icon';
+import { iconHTML } from 'discourse-common/helpers/fa-icon';
import { default as computed, observes } from 'ember-addons/ember-computed-decorators';
+import { bufferedRender } from 'discourse-common/lib/buffered-render';
-export default Ember.Component.extend(StringBuffer, {
+export default Ember.Component.extend(bufferedRender({
classNameBindings: [':popup-tip', 'good', 'bad', 'lastShownAt::hide'],
animateAttribute: null,
bouncePixels: 6,
@@ -37,7 +37,7 @@ export default Ember.Component.extend(StringBuffer, {
}
},
- renderString(buffer) {
+ buildBuffer(buffer) {
const reason = this.get('validation.reason');
if (!reason) { return; }
@@ -55,4 +55,4 @@ export default Ember.Component.extend(StringBuffer, {
$elem.animate({ right: '-=' + this.bouncePixels }, this.bounceDelay).animate({ right: '+=' + this.bouncePixels }, this.bounceDelay);
}
}
-});
+}));
diff --git a/app/assets/javascripts/discourse/components/queued-post.js.es6 b/app/assets/javascripts/discourse/components/queued-post.js.es6
index 28f5a90fdd0..9629724b438 100644
--- a/app/assets/javascripts/discourse/components/queued-post.js.es6
+++ b/app/assets/javascripts/discourse/components/queued-post.js.es6
@@ -13,7 +13,6 @@ function updateState(state, opts) {
post.update(args).then(() => {
this.sendAction('removePost', post);
- // this.get('controllers.queued-posts.model').removeObject(post);
}).catch(popupAjaxError);
};
}
diff --git a/app/assets/javascripts/discourse/components/quote-button.js.es6 b/app/assets/javascripts/discourse/components/quote-button.js.es6
new file mode 100644
index 00000000000..a8c8f5cfa57
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/quote-button.js.es6
@@ -0,0 +1,135 @@
+import { selectedText } from 'discourse/lib/utilities';
+
+// we don't want to deselect when we click on buttons that use it
+function willQuote(e) {
+ const $target = $(e.target);
+ return $target.hasClass('quote-button') || $target.closest('.create, .share, .reply-new').length;
+}
+
+export default Ember.Component.extend({
+ classNames: ['quote-button'],
+ classNameBindings: ['visible'],
+ visible: false,
+
+ _isMouseDown: false,
+ _reselected: false,
+
+ _hideButton() {
+ this.get('quoteState').clear();
+ this.set('visible', false);
+ },
+
+ _selectionChanged() {
+ const quoteState = this.get('quoteState');
+
+ const selection = window.getSelection();
+ if (selection.isCollapsed) {
+ if (this.get("visible")) { this._hideButton(); }
+ return;
+ }
+
+ // ensure we selected content inside 1 post *only*
+ let firstRange, postId;
+ for (let r = 0; r < selection.rangeCount; r++) {
+ const range = selection.getRangeAt(r);
+
+ if ($(range.endContainer).closest('.cooked').length === 0) return;
+
+ const $ancestor = $(range.commonAncestorContainer);
+
+ firstRange = firstRange || range;
+ postId = postId || $ancestor.closest('.boxed, .reply').data('post-id');
+
+ if ($ancestor.closest(".contents").length === 0 || !postId) {
+ if (this.get("visible")) { this._hideButton(); }
+ return;
+ }
+ }
+
+ quoteState.selected(postId, selectedText());
+ this.set('visible', quoteState.buffer.length > 0);
+
+ // on Desktop, shows the button at the beginning of the selection
+ // on Mobile, shows the button at the end of the selection
+ const isMobileDevice = this.site.isMobileDevice;
+ const { isIOS, isAndroid, isSafari } = this.capabilities;
+ const showAtEnd = isMobileDevice || isIOS || isAndroid;
+
+ // used to work around Safari losing selection
+ const clone = firstRange.cloneRange();
+
+ // create a marker element containing a single invisible character
+ const markerElement = document.createElement("span");
+ markerElement.appendChild(document.createTextNode("\ufeff"));
+
+ // on mobile, collapse the range at the end of the selection
+ if (showAtEnd) { firstRange.collapse(); }
+ // insert the marker
+ firstRange.insertNode(markerElement);
+
+ // retrieve the position of the marker
+ const $markerElement = $(markerElement);
+ const markerOffset = $markerElement.offset();
+ const parentScrollLeft = $markerElement.parent().scrollLeft();
+ const $quoteButton = this.$();
+
+ // remove the marker
+ markerElement.parentNode.removeChild(markerElement);
+
+ // work around Safari that would sometimes lose the selection
+ if (isSafari) {
+ this._reselected = true;
+ selection.removeAllRanges();
+ selection.addRange(clone);
+ }
+
+ // change the position of the button
+ Ember.run.scheduleOnce("afterRender", () => {
+ let top = markerOffset.top;
+ let left = markerOffset.left + Math.max(0, parentScrollLeft);
+
+ if (showAtEnd) {
+ top = top + 20;
+ left = Math.min(left + 10, $(window).width() - $quoteButton.outerWidth());
+ } else {
+ top = top - $quoteButton.outerHeight() - 5;
+ }
+
+ $quoteButton.offset({ top, left });
+ });
+
+ },
+
+ didInsertElement() {
+ const { isWinphone, isAndroid } = this.capabilities;
+ const wait = (isWinphone || isAndroid) ? 250 : 25;
+ const onSelectionChanged = _.debounce(() => this._selectionChanged(), wait);
+
+ $(document).on("mousedown.quote-button", e => {
+ this._isMouseDown = true;
+ this._reselected = false;
+ if (!willQuote(e)) {
+ this._hideButton();
+ }
+ }).on("mouseup.quote-button", () => {
+ this._isMouseDown = false;
+ onSelectionChanged();
+ }).on("selectionchange.quote-button", () => {
+ if (!this._isMouseDown && !this._reselected) {
+ onSelectionChanged();
+ }
+ });
+ },
+
+ willDestroyElement() {
+ $(document).off("mousedown.quote-button")
+ .off("mouseup.quote-button")
+ .off("selectionchange.quote-button");
+ },
+
+ click() {
+ const { postId, buffer } = this.get('quoteState');
+ this.attrs.selectText(postId, buffer).then(() => this._hideButton());
+ return false;
+ }
+});
diff --git a/app/assets/javascripts/discourse/components/search-advanced-options.js.es6 b/app/assets/javascripts/discourse/components/search-advanced-options.js.es6
new file mode 100644
index 00000000000..23bdac794b4
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/search-advanced-options.js.es6
@@ -0,0 +1,526 @@
+import { observes } from 'ember-addons/ember-computed-decorators';
+import { escapeExpression } from 'discourse/lib/utilities';
+
+const REGEXP_BLOCKS = /(([^" \t\n\x0B\f\r]+)?(("[^"]+")?))/g;
+
+const REGEXP_USERNAME_PREFIX = /(user:|@)/ig;
+const REGEXP_CATEGORY_PREFIX = /(category:|#)/ig;
+const REGEXP_GROUP_PREFIX = /group:/ig;
+const REGEXP_BADGE_PREFIX = /badge:/ig;
+const REGEXP_TAGS_PREFIX = /tags?:/ig;
+const REGEXP_IN_PREFIX = /in:/ig;
+const REGEXP_STATUS_PREFIX = /status:/ig;
+const REGEXP_MIN_POST_COUNT_PREFIX = /min_post_count:/ig;
+const REGEXP_POST_TIME_PREFIX = /(before|after):/ig;
+
+const REGEXP_IN_MATCH = /in:(posted|watching|tracking|bookmarks|first|pinned|unpinned)/ig;
+const REGEXP_SPECIAL_IN_LIKES_MATCH = /in:likes/ig;
+const REGEXP_SPECIAL_IN_PRIVATE_MATCH = /in:private/ig;
+const REGEXP_SPECIAL_IN_WIKI_MATCH = /in:wiki/ig;
+
+const REGEXP_CATEGORY_SLUG = /(\#[a-zA-Z0-9\-:]+)/ig;
+const REGEXP_CATEGORY_ID = /(category:[0-9]+)/ig;
+const REGEXP_POST_TIME_WHEN = /(before|after)/ig;
+
+export default Em.Component.extend({
+ classNames: ['search-advanced-options'],
+
+ inOptions: [
+ {name: I18n.t('search.advanced.filters.posted'), value: "posted"},
+ {name: I18n.t('search.advanced.filters.watching'), value: "watching"},
+ {name: I18n.t('search.advanced.filters.tracking'), value: "tracking"},
+ {name: I18n.t('search.advanced.filters.bookmarks'), value: "bookmarks"},
+ {name: I18n.t('search.advanced.filters.first'), value: "first"},
+ {name: I18n.t('search.advanced.filters.pinned'), value: "pinned"},
+ {name: I18n.t('search.advanced.filters.unpinned'), value: "unpinned"},
+ ],
+ statusOptions: [
+ {name: I18n.t('search.advanced.statuses.open'), value: "open"},
+ {name: I18n.t('search.advanced.statuses.closed'), value: "closed"},
+ {name: I18n.t('search.advanced.statuses.archived'), value: "archived"},
+ {name: I18n.t('search.advanced.statuses.noreplies'), value: "noreplies"},
+ {name: I18n.t('search.advanced.statuses.single_user'), value: "single_user"},
+ ],
+ postTimeOptions: [
+ {name: I18n.t('search.advanced.post.time.before'), value: "before"},
+ {name: I18n.t('search.advanced.post.time.after'), value: "after"}
+ ],
+
+ init() {
+ this._super();
+ Ember.run.scheduleOnce('afterRender', () => {
+ this._init();
+ this._update();
+ });
+ },
+
+ @observes('searchTerm')
+ _updateOptions() {
+ this._update();
+ Ember.run.debounce(this, this._update, 250);
+ },
+
+ _init() {
+ this.setProperties({
+ searchedTerms: {
+ username: '',
+ category: '',
+ group: [],
+ badge: [],
+ tags: [],
+ in: '',
+ special: {
+ in: {
+ likes: false,
+ private: false,
+ wiki: false
+ }
+ },
+ status: '',
+ min_post_count: '',
+ time: {
+ when: 'before',
+ days: ''
+ }
+ }
+ });
+ },
+
+ _update() {
+ if (!this.get('searchTerm')) {
+ this._init();
+ return;
+ }
+
+ this.setSearchedTermValue('searchedTerms.username', REGEXP_USERNAME_PREFIX);
+ this.setSearchedTermValueForCategory();
+ this.setSearchedTermValueForGroup();
+ this.setSearchedTermValueForBadge();
+ this.setSearchedTermValueForTags();
+ this.setSearchedTermValue('searchedTerms.in', REGEXP_IN_PREFIX, REGEXP_IN_MATCH);
+ this.setSearchedTermSpecialInValue('searchedTerms.special.in.likes', REGEXP_SPECIAL_IN_LIKES_MATCH);
+ this.setSearchedTermSpecialInValue('searchedTerms.special.in.private', REGEXP_SPECIAL_IN_PRIVATE_MATCH);
+ this.setSearchedTermSpecialInValue('searchedTerms.special.in.wiki', REGEXP_SPECIAL_IN_WIKI_MATCH);
+ this.setSearchedTermValue('searchedTerms.status', REGEXP_STATUS_PREFIX);
+ this.setSearchedTermValueForPostTime();
+ this.setSearchedTermValue('searchedTerms.min_post_count', REGEXP_MIN_POST_COUNT_PREFIX);
+ },
+
+ findSearchTerms() {
+ const searchTerm = escapeExpression(this.get('searchTerm'));
+ if (!searchTerm)
+ return [];
+
+ const blocks = searchTerm.match(REGEXP_BLOCKS);
+ if (!blocks) return [];
+
+ let result = [];
+ blocks.forEach(block => {
+ if (block.length !== 0)
+ result.push(block);
+ });
+
+ return result;
+ },
+
+ filterBlocks(regexPrefix) {
+ const blocks = this.findSearchTerms();
+ if (!blocks) return [];
+
+ let result = [];
+ blocks.forEach(block => {
+ if (block.search(regexPrefix) !== -1)
+ result.push(block);
+ });
+
+ return result;
+ },
+
+ setSearchedTermValue(key, replaceRegEx, matchRegEx = null) {
+ matchRegEx = matchRegEx || replaceRegEx;
+ const match = this.filterBlocks(matchRegEx);
+
+ if (match.length !== 0) {
+ const userInput = match[0].replace(replaceRegEx, '');
+ if (this.get(key) !== userInput) {
+ this.set(key, userInput);
+ }
+ } else if(this.get(key).length !== 0) {
+ this.set(key, '');
+ }
+ },
+
+ setSearchedTermSpecialInValue(key, replaceRegEx) {
+ const match = this.filterBlocks(replaceRegEx);
+
+ if (match.length !== 0) {
+ if (this.get(key) !== true) {
+ this.set(key, true);
+ }
+ } else if(this.get(key) !== false) {
+ this.set(key, false);
+ }
+ },
+
+ setSearchedTermValueForCategory() {
+ const match = this.filterBlocks(REGEXP_CATEGORY_PREFIX);
+ if (match.length !== 0) {
+ const existingInput = this.get('searchedTerms.category');
+ const subcategories = match[0].replace(REGEXP_CATEGORY_PREFIX, '').split(':');
+ if (subcategories.length > 1) {
+ const userInput = Discourse.Category.findBySlug(subcategories[1], subcategories[0]);
+ if ((!existingInput && userInput)
+ || (existingInput && userInput && existingInput.id !== userInput.id))
+ this.set('searchedTerms.category', [userInput]);
+ } else
+ if (isNaN(subcategories)) {
+ const userInput = Discourse.Category.findSingleBySlug(subcategories[0]);
+ if ((!existingInput && userInput)
+ || (existingInput && userInput && existingInput.id !== userInput.id))
+ this.set('searchedTerms.category', [userInput]);
+ } else {
+ const userInput = Discourse.Category.findById(subcategories[0]);
+ if ((!existingInput && userInput)
+ || (existingInput && userInput && existingInput.id !== userInput.id))
+ this.set('searchedTerms.category', [userInput]);
+ }
+ } else
+ this.set('searchedTerms.category', '');
+ },
+
+ setSearchedTermValueForGroup() {
+ const match = this.filterBlocks(REGEXP_GROUP_PREFIX);
+ const group = this.get('searchedTerms.group');
+
+ if (match.length !== 0) {
+ const existingInput = _.isArray(group) ? group[0] : group;
+ const userInput = match[0].replace(REGEXP_GROUP_PREFIX, '');
+
+ if (existingInput !== userInput) {
+ this.set('searchedTerms.group', (userInput.length !== 0) ? [userInput] : []);
+ }
+ } else if (group.length !== 0) {
+ this.set('searchedTerms.group', []);
+ }
+ },
+
+ setSearchedTermValueForBadge() {
+ const match = this.filterBlocks(REGEXP_BADGE_PREFIX);
+ const badge = this.get('searchedTerms.badge');
+
+ if (match.length !== 0) {
+ const existingInput = _.isArray(badge) ? badge[0] : badge;
+ const userInput = match[0].replace(REGEXP_BADGE_PREFIX, '');
+
+ if (existingInput !== userInput) {
+ this.set('searchedTerms.badge', (userInput.length !== 0) ? [userInput] : []);
+ }
+ } else if (badge.length !== 0) {
+ this.set('searchedTerms.badge', []);
+ }
+ },
+
+ setSearchedTermValueForTags() {
+ if (!this.siteSettings.tagging_enabled) return;
+
+ const match = this.filterBlocks(REGEXP_TAGS_PREFIX);
+ const tags = this.get('searchedTerms.tags');
+
+ if (match.length !== 0) {
+ const existingInput = _.isArray(tags) ? tags.join(',') : tags;
+ const userInput = match[0].replace(REGEXP_TAGS_PREFIX, '');
+
+ if (existingInput !== userInput) {
+ this.set('searchedTerms.tags', (userInput.length !== 0) ? userInput.split(',') : []);
+ }
+ } else if (tags.length !== 0) {
+ this.set('searchedTerms.tags', []);
+ }
+ },
+
+ setSearchedTermValueForPostTime() {
+ const match = this.filterBlocks(REGEXP_POST_TIME_PREFIX);
+
+ if (match.length !== 0) {
+ const existingInputWhen = this.get('searchedTerms.time.when');
+ const userInputWhen = match[0].match(REGEXP_POST_TIME_WHEN)[0];
+ const existingInputDays = this.get('searchedTerms.time.days');
+ const userInputDays = match[0].replace(REGEXP_POST_TIME_PREFIX, '');
+
+ if (existingInputWhen !== userInputWhen) {
+ this.set('searchedTerms.time.when', userInputWhen);
+ }
+
+ if (existingInputDays !== userInputDays) {
+ this.set('searchedTerms.time.days', userInputDays);
+ }
+ } else {
+ this.set('searchedTerms.time.days', '');
+ }
+ },
+
+ @observes('searchedTerms.username')
+ updateSearchTermForUsername() {
+ const match = this.filterBlocks(REGEXP_USERNAME_PREFIX);
+ const userFilter = this.get('searchedTerms.username');
+ let searchTerm = this.get('searchTerm') || '';
+
+ if (userFilter && userFilter.length !== 0) {
+ if (match.length !== 0) {
+ searchTerm = searchTerm.replace(match[0], `@${userFilter}`);
+ } else {
+ searchTerm += ` @${userFilter}`;
+ }
+
+ this.set('searchTerm', searchTerm.trim());
+ } else if (match.length !== 0) {
+ searchTerm = searchTerm.replace(match[0], '');
+ this.set('searchTerm', searchTerm.trim());
+ }
+ },
+
+ @observes('searchedTerms.category')
+ updateSearchTermForCategory() {
+ const match = this.filterBlocks(REGEXP_CATEGORY_PREFIX);
+ const categoryFilter = this.get('searchedTerms.category');
+ let searchTerm = this.get('searchTerm') || '';
+
+ const slugCategoryMatches = (match.length !== 0) ? match[0].match(REGEXP_CATEGORY_SLUG) : null;
+ const idCategoryMatches = (match.length !== 0) ? match[0].match(REGEXP_CATEGORY_ID) : null;
+ if (categoryFilter && categoryFilter[0]) {
+ const id = categoryFilter[0].id;
+ const slug = categoryFilter[0].slug;
+ if (categoryFilter[0].parentCategory) {
+ const parentSlug = categoryFilter[0].parentCategory.slug;
+ if (slugCategoryMatches)
+ searchTerm = searchTerm.replace(slugCategoryMatches[0], `#${parentSlug}:${slug}`);
+ else if (idCategoryMatches)
+ searchTerm = searchTerm.replace(idCategoryMatches[0], `category:${id}`);
+ else
+ searchTerm += ` #${parentSlug}:${slug}`;
+
+ this.set('searchTerm', searchTerm.trim());
+ } else {
+ if (slugCategoryMatches)
+ searchTerm = searchTerm.replace(slugCategoryMatches[0], `#${slug}`);
+ else if (idCategoryMatches)
+ searchTerm = searchTerm.replace(idCategoryMatches[0], `category:${id}`);
+ else
+ searchTerm += ` #${slug}`;
+
+ this.set('searchTerm', searchTerm.trim());
+ }
+ } else {
+ if (slugCategoryMatches)
+ searchTerm = searchTerm.replace(slugCategoryMatches[0], '');
+ if (idCategoryMatches)
+ searchTerm = searchTerm.replace(idCategoryMatches[0], '');
+
+ this.set('searchTerm', searchTerm.trim());
+ }
+ },
+
+ @observes('searchedTerms.group')
+ updateSearchTermForGroup() {
+ const match = this.filterBlocks(REGEXP_GROUP_PREFIX);
+ const groupFilter = this.get('searchedTerms.group');
+ let searchTerm = this.get('searchTerm') || '';
+
+ if (groupFilter && groupFilter.length !== 0) {
+ if (match.length !== 0) {
+ searchTerm = searchTerm.replace(match[0], ` group:${groupFilter}`);
+ } else {
+ searchTerm += ` group:${groupFilter}`;
+ }
+
+ this.set('searchTerm', searchTerm);
+ } else if (match.length !== 0) {
+ searchTerm = searchTerm.replace(match[0], '');
+ this.set('searchTerm', searchTerm.trim());
+ }
+ },
+
+ @observes('searchedTerms.badge')
+ updateSearchTermForBadge() {
+ const match = this.filterBlocks(REGEXP_BADGE_PREFIX);
+ const badgeFilter = this.get('searchedTerms.badge');
+ let searchTerm = this.get('searchTerm') || '';
+
+ if (badgeFilter && badgeFilter.length !== 0) {
+ if (match.length !== 0) {
+ searchTerm = searchTerm.replace(match[0], ` badge:${badgeFilter}`);
+ } else {
+ searchTerm += ` badge:${badgeFilter}`;
+ }
+
+ this.set('searchTerm', searchTerm);
+ } else if (match.length !== 0) {
+ searchTerm = searchTerm.replace(match[0], '');
+ this.set('searchTerm', searchTerm.trim());
+ }
+ },
+
+ @observes('searchedTerms.tags')
+ updateSearchTermForTags() {
+ const match = this.filterBlocks(REGEXP_TAGS_PREFIX);
+ const tagFilter = this.get('searchedTerms.tags');
+ let searchTerm = this.get('searchTerm') || '';
+
+ if (tagFilter && tagFilter.length !== 0) {
+ const tags = tagFilter.join(',');
+
+ if (match.length !== 0) {
+ searchTerm = searchTerm.replace(match[0], `tags:${tags}`);
+ } else {
+ searchTerm += ` tags:${tags}`;
+ }
+
+ this.set('searchTerm', searchTerm.trim());
+ } else if (match.length !== 0) {
+ searchTerm = searchTerm.replace(match[0], '');
+ this.set('searchTerm', searchTerm.trim());
+ }
+ },
+
+ @observes('searchedTerms.in')
+ updateSearchTermForIn() {
+ const match = this.filterBlocks(REGEXP_IN_MATCH);
+ const inFilter = this.get('searchedTerms.in');
+ let searchTerm = this.get('searchTerm') || '';
+
+ if (inFilter) {
+ if (match.length !== 0) {
+ searchTerm = searchTerm.replace(match[0], `in:${inFilter}`);
+ } else {
+ searchTerm += ` in:${inFilter}`;
+ }
+
+ this.set('searchTerm', searchTerm.trim());
+ } else if (match.length !== 0) {
+ searchTerm = searchTerm.replace(match, '');
+ this.set('searchTerm', searchTerm.trim());
+ }
+ },
+
+ @observes('searchedTerms.special.in.likes')
+ updateSearchTermForSpecialInLikes() {
+ const match = this.filterBlocks(REGEXP_SPECIAL_IN_LIKES_MATCH);
+ const inFilter = this.get('searchedTerms.special.in.likes');
+ let searchTerm = this.get('searchTerm') || '';
+
+ if (inFilter) {
+ if (match.length === 0) {
+ searchTerm += ` in:likes`;
+ this.set('searchTerm', searchTerm.trim());
+ }
+ } else if (match.length !== 0) {
+ searchTerm = searchTerm.replace(match, '');
+ this.set('searchTerm', searchTerm.trim());
+ }
+ },
+
+ @observes('searchedTerms.special.in.private')
+ updateSearchTermForSpecialInPrivate() {
+ const match = this.filterBlocks(REGEXP_SPECIAL_IN_PRIVATE_MATCH);
+ const inFilter = this.get('searchedTerms.special.in.private');
+ let searchTerm = this.get('searchTerm') || '';
+
+ if (inFilter) {
+ if (match.length === 0) {
+ searchTerm += ` in:private`;
+ this.set('searchTerm', searchTerm.trim());
+ }
+ } else if (match.length !== 0) {
+ searchTerm = searchTerm.replace(match, '');
+ this.set('searchTerm', searchTerm.trim());
+ }
+ },
+
+ @observes('searchedTerms.special.in.wiki')
+ updateSearchTermForSpecialInWiki() {
+ const match = this.filterBlocks(REGEXP_SPECIAL_IN_WIKI_MATCH);
+ const inFilter = this.get('searchedTerms.special.in.wiki');
+ let searchTerm = this.get('searchTerm') || '';
+
+ if (inFilter) {
+ if (match.length === 0) {
+ searchTerm += ` in:wiki`;
+ this.set('searchTerm', searchTerm.trim());
+ }
+ } else if (match.length !== 0) {
+ searchTerm = searchTerm.replace(match, '');
+ this.set('searchTerm', searchTerm.trim());
+ }
+ },
+
+ @observes('searchedTerms.status')
+ updateSearchTermForStatus() {
+ const match = this.filterBlocks(REGEXP_STATUS_PREFIX);
+ const statusFilter = this.get('searchedTerms.status');
+ let searchTerm = this.get('searchTerm') || '';
+
+ if (statusFilter) {
+ if (match.length !== 0) {
+ searchTerm = searchTerm.replace(match[0], `status:${statusFilter}`);
+ } else {
+ searchTerm += ` status:${statusFilter}`;
+ }
+
+ this.set('searchTerm', searchTerm.trim());
+ } else if (match.length !== 0) {
+ searchTerm = searchTerm.replace(match[0], '');
+ this.set('searchTerm', searchTerm.trim());
+ }
+ },
+
+ @observes('searchedTerms.time.when', 'searchedTerms.time.days')
+ updateSearchTermForPostTime() {
+ const match = this.filterBlocks(REGEXP_POST_TIME_PREFIX);
+ const timeDaysFilter = this.get('searchedTerms.time.days');
+ let searchTerm = this.get('searchTerm') || '';
+
+ if (timeDaysFilter) {
+ const when = this.get('searchedTerms.time.when');
+ if (match.length !== 0) {
+ searchTerm = searchTerm.replace(match[0], `${when}:${timeDaysFilter}`);
+ } else {
+ searchTerm += ` ${when}:${timeDaysFilter}`;
+ }
+
+ this.set('searchTerm', searchTerm.trim());
+ } else if (match.length !== 0) {
+ searchTerm = searchTerm.replace(match[0], '');
+ this.set('searchTerm', searchTerm.trim());
+ }
+ },
+
+ @observes('searchedTerms.min_post_count')
+ updateSearchTermForMinPostCount() {
+ const match = this.filterBlocks(REGEXP_MIN_POST_COUNT_PREFIX);
+ const postsCountFilter = this.get('searchedTerms.min_post_count');
+ let searchTerm = this.get('searchTerm') || '';
+
+ if (postsCountFilter) {
+ if (match.length !== 0) {
+ searchTerm = searchTerm.replace(match[0], `min_post_count:${postsCountFilter}`);
+ } else {
+ searchTerm += ` min_post_count:${postsCountFilter}`;
+ }
+
+ this.set('searchTerm', searchTerm.trim());
+ } else if (match.length !== 0) {
+ searchTerm = searchTerm.replace(match[0], '');
+ this.set('searchTerm', searchTerm.trim());
+ }
+ },
+
+ groupFinder(term) {
+ const Group = require('discourse/models/group').default;
+ return Group.findAll({search: term, ignore_automatic: false});
+ },
+
+ badgeFinder(term) {
+ const Badge = require('discourse/models/badge').default;
+ return Badge.findAll({search: term});
+ }
+});
diff --git a/app/assets/javascripts/discourse/components/share-popup.js.es6 b/app/assets/javascripts/discourse/components/share-popup.js.es6
new file mode 100644
index 00000000000..4a502736319
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/share-popup.js.es6
@@ -0,0 +1,157 @@
+import { wantsNewWindow } from 'discourse/lib/intercept-click';
+import { longDateNoYear } from 'discourse/lib/formatter';
+import computed from 'ember-addons/ember-computed-decorators';
+import Sharing from 'discourse/lib/sharing';
+
+export default Ember.Component.extend({
+ elementId: 'share-link',
+ classNameBindings: ['visible'],
+ link: null,
+ visible: null,
+
+ @computed
+ sources() {
+ return Sharing.activeSources(this.siteSettings.share_links);
+ },
+
+ @computed('type', 'postNumber')
+ shareTitle(type, postNumber) {
+ if (type === 'topic') { return I18n.t('share.topic'); }
+ if (postNumber) {
+ return I18n.t('share.post', { postNumber });
+ }
+ return I18n.t('share.topic');
+ },
+
+ @computed('date')
+ displayDate(date) {
+ return longDateNoYear(new Date(date));
+ },
+
+ _focusUrl() {
+ const link = this.get('link');
+ if (!this.capabilities.touch) {
+ const $linkInput = $('#share-link input');
+ $linkInput.val(link);
+
+ // Wait for the fade-in transition to finish before selecting the link:
+ window.setTimeout(() => $linkInput.select().focus(), 160);
+ } else {
+ const $linkForTouch = $('#share-link .share-for-touch a');
+ $linkForTouch.attr('href', link);
+ $linkForTouch.html(link);
+ const range = window.document.createRange();
+ range.selectNode($linkForTouch[0]);
+ window.getSelection().addRange(range);
+ }
+ },
+
+ _showUrl($target, url) {
+ const $currentTargetOffset = $target.offset();
+ const $this = this.$();
+
+ if (Ember.isEmpty(url)) { return; }
+
+ // Relative urls
+ if (url.indexOf("/") === 0) {
+ url = window.location.protocol + "//" + window.location.host + url;
+ }
+
+ const shareLinkWidth = $this.width();
+ let x = $currentTargetOffset.left - (shareLinkWidth / 2);
+ if (x < 25) { x = 25; }
+ if (x + shareLinkWidth > $(window).width()) {
+ x -= shareLinkWidth / 2;
+ }
+
+ const header = $('.d-header');
+ let y = $currentTargetOffset.top - ($this.height() + 20);
+ if (y < header.offset().top + header.height()) {
+ y = $currentTargetOffset.top + 10;
+ }
+
+ $this.css({top: "" + y + "px"});
+
+ if (!this.site.mobileView) {
+ $this.css({left: "" + x + "px"});
+ }
+ this.set('link', url);
+ this.set('visible', true);
+
+ Ember.run.scheduleOnce('afterRender', this, this._focusUrl);
+ },
+
+ didInsertElement() {
+ this._super();
+
+ const $html = $('html');
+ $html.on('mousedown.outside-share-link', e => {
+ // Use mousedown instead of click so this event is handled before routing occurs when a
+ // link is clicked (which is a click event) while the share dialog is showing.
+ if (this.$().has(e.target).length !== 0) { return; }
+ this.send('close');
+ return true;
+ });
+
+ $html.on('click.discoure-share-link', '[data-share-url]', e => {
+ // if they want to open in a new tab, let it so
+ if (wantsNewWindow(e)) { return true; }
+
+ e.preventDefault();
+
+ const $currentTarget = $(e.currentTarget);
+ const url = $currentTarget.data('share-url');
+ const postNumber = $currentTarget.data('post-number');
+ const postId = $currentTarget.closest('article').data('post-id');
+ const date = $currentTarget.children().data('time');
+
+ this.setProperties({ postNumber, date, postId });
+ this._showUrl($currentTarget, url);
+ return false;
+ });
+
+ $html.on('keydown.share-view', e => {
+ if (e.keyCode === 27) {
+ this.send('close');
+ }
+ });
+
+ this.appEvents.on('share:url', (url, $target) => this._showUrl($target, url));
+ },
+
+ willDestroyElement() {
+ this._super();
+ $('html').off('click.discoure-share-link')
+ .off('mousedown.outside-share-link')
+ .off('keydown.share-view');
+ },
+
+ actions: {
+ replyAsNewTopic() {
+ const postStream = this.get("topic.postStream");
+ const postId = this.get("postId") || postStream.findPostIdForPostNumber(1);
+ const post = postStream.findLoadedPost(postId);
+ this.sendAction('replyAsNewTopic', post);
+ this.send("close");
+ },
+
+ close() {
+ this.setProperties({
+ link: null,
+ postNumber: null,
+ postId: null,
+ visible: false
+ });
+ },
+
+ share(source) {
+ const url = source.generateUrl(this.get('link'), this.get('topic.title'));
+ if (source.shouldOpenInPopup) {
+ window.open(url, '', 'menubar=no,toolbar=no,resizable=yes,scrollbars=yes,width=600,height=' + (source.popupHeight || 315));
+ } else {
+ window.open(url, '_blank');
+ }
+ }
+ }
+
+});
diff --git a/app/assets/javascripts/discourse/components/site-header.js.es6 b/app/assets/javascripts/discourse/components/site-header.js.es6
index bf66453c67f..9285f5355b8 100644
--- a/app/assets/javascripts/discourse/components/site-header.js.es6
+++ b/app/assets/javascripts/discourse/components/site-header.js.es6
@@ -47,6 +47,12 @@ const SiteHeaderComponent = MountWidget.extend(Docking, {
this.queueRerender();
},
+ willRender() {
+ if (this.get('currentUser.staff')) {
+ $('body').addClass('staff');
+ }
+ },
+
didInsertElement() {
this._super();
$(window).on('resize.discourse-menu-panel', () => this.afterRender());
diff --git a/app/assets/javascripts/discourse/components/tag-chooser.js.es6 b/app/assets/javascripts/discourse/components/tag-chooser.js.es6
index 64d5fc8e69c..00fc2444879 100644
--- a/app/assets/javascripts/discourse/components/tag-chooser.js.es6
+++ b/app/assets/javascripts/discourse/components/tag-chooser.js.es6
@@ -1,17 +1,24 @@
import renderTag from 'discourse/lib/render-tag';
function formatTag(t) {
- return renderTag(t.id, {count: t.count});
+ return renderTag(t.id, {count: t.count, noHref: true});
}
export default Ember.TextField.extend({
classNameBindings: [':tag-chooser'],
attributeBindings: ['tabIndex', 'placeholderKey', 'categoryId'],
- _initValue: function() {
+ init() {
+ this._super();
const tags = this.get('tags') || [];
this.set('value', tags.join(", "));
- }.on('init'),
+
+ if (this.get('allowCreate') !== false) {
+ this.set('allowCreate', this.site.get('can_create_tag'));
+ }
+
+ this.set('termMatchesForbidden', false);
+ },
_valueChanged: function() {
const tags = this.get('value').split(',').map(v => v.trim()).reject(v => v.length === 0).uniq();
@@ -32,18 +39,13 @@ export default Ember.TextField.extend({
}
}.observes('tags'),
- _initializeTags: function() {
- const site = this.site,
- self = this,
- filterRegexp = new RegExp(this.site.tags_filter_regexp, "g");
+ didInsertElement() {
+ this._super();
- var limit = this.siteSettings.max_tags_per_topic;
+ const self = this;
+ const filterRegexp = new RegExp(this.site.tags_filter_regexp, "g");
- if (this.get('allowCreate') !== false) {
- this.set('allowCreate', site.get('can_create_tag'));
- }
-
- this.set('termMatchesForbidden', false);
+ let limit = this.siteSettings.max_tags_per_topic;
if (this.get('unlimitedTagCount')) {
limit = null;
@@ -56,6 +58,7 @@ export default Ember.TextField.extend({
placeholder: this.get('placeholder') === "" ? "" : I18n.t(this.get('placeholderKey') || 'tagging.choose_for_topic'),
maximumInputLength: this.siteSettings.max_tag_length,
maximumSelectionSize: limit,
+ width: this.get('width') || 'resolve',
initSelection(element, callback) {
const data = [];
@@ -76,8 +79,8 @@ export default Ember.TextField.extend({
callback(data);
},
- createSearchChoice: function(term, data) {
- term = term.replace(filterRegexp, '').trim();
+ createSearchChoice(term, data) {
+ term = term.replace(filterRegexp, '').trim().toLowerCase();
// No empty terms, make sure the user has permission to create the tag
if (!term.length || !self.get('allowCreate') || self.get('termMatchesForbidden')) return;
@@ -88,14 +91,14 @@ export default Ember.TextField.extend({
return { id: term, text: term };
}
},
- createSearchChoicePosition: function(list, item) {
+ createSearchChoicePosition(list, item) {
// Search term goes on the bottom
list.push(item);
},
- formatSelection: function (data) {
- return data ? renderTag(this.text(data)) : undefined;
+ formatSelection(data) {
+ return data ? renderTag(this.text(data), {noHref: true}) : undefined;
},
- formatSelectionCssClass: function(){
+ formatSelectionCssClass() {
return "discourse-tag-select2";
},
formatResult: formatTag,
@@ -126,10 +129,11 @@ export default Ember.TextField.extend({
}
},
});
- }.on('didInsertElement'),
+ },
- _destroyTags: function() {
+ willDestroyElement() {
+ this._super();
this.$().select2('destroy');
- }.on('willDestroyElement')
+ }
});
diff --git a/app/assets/javascripts/discourse/components/tag-drop-link.js.es6 b/app/assets/javascripts/discourse/components/tag-drop-link.js.es6
index 8cfad3cd2af..f2f671e4031 100644
--- a/app/assets/javascripts/discourse/components/tag-drop-link.js.es6
+++ b/app/assets/javascripts/discourse/components/tag-drop-link.js.es6
@@ -17,10 +17,6 @@ export default Ember.Component.extend({
return "tag-" + this.get('tagId');
}.property('tagId'),
- render(buffer) {
- buffer.push(Handlebars.Utils.escapeExpression(this.get('tagId')));
- },
-
click(e) {
e.preventDefault();
DiscourseURL.routeTo(this.get('href'));
diff --git a/app/assets/javascripts/discourse/components/tags-admin-dropdown.js.es6 b/app/assets/javascripts/discourse/components/tags-admin-dropdown.js.es6
index c90efb35f9a..6d1c7ae7b31 100644
--- a/app/assets/javascripts/discourse/components/tags-admin-dropdown.js.es6
+++ b/app/assets/javascripts/discourse/components/tags-admin-dropdown.js.es6
@@ -1,4 +1,4 @@
-import { iconHTML } from 'discourse/helpers/fa-icon';
+import { iconHTML } from 'discourse-common/helpers/fa-icon';
import DropdownButton from 'discourse/components/dropdown-button';
import computed from "ember-addons/ember-computed-decorators";
diff --git a/app/assets/javascripts/discourse/components/text-overflow.js.es6 b/app/assets/javascripts/discourse/components/text-overflow.js.es6
index 73a4637bfdc..4906ad1a500 100644
--- a/app/assets/javascripts/discourse/components/text-overflow.js.es6
+++ b/app/assets/javascripts/discourse/components/text-overflow.js.es6
@@ -1,12 +1,9 @@
export default Ember.Component.extend({
- _parse: function() {
+ didInsertElement() {
+ this._super();
Ember.run.next(null, () => {
this.$().find('hr').remove();
this.$().ellipsis();
});
- }.on('didInsertElement'),
-
- render(buffer) {
- buffer.push(this.get('text'));
}
});
diff --git a/app/assets/javascripts/discourse/components/toggle-deleted.js.es6 b/app/assets/javascripts/discourse/components/toggle-deleted.js.es6
deleted file mode 100644
index 72ad47d0045..00000000000
--- a/app/assets/javascripts/discourse/components/toggle-deleted.js.es6
+++ /dev/null
@@ -1,12 +0,0 @@
-export default Ember.Component.extend({
- layoutName: 'components/toggle-deleted',
- tagName: 'section',
- classNames: ['information'],
- postStream: Em.computed.alias('topic.postStream'),
-
- actions: {
- toggleDeleted: function() {
- this.get('postStream').toggleDeleted();
- }
- }
-});
diff --git a/app/assets/javascripts/discourse/components/topic-category.js.es6 b/app/assets/javascripts/discourse/components/topic-category.js.es6
new file mode 100644
index 00000000000..97fcde13cda
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/topic-category.js.es6
@@ -0,0 +1,2 @@
+// Injections don't occur without a class
+export default Ember.Component.extend();
diff --git a/app/assets/javascripts/discourse/components/topic-closing.js.es6 b/app/assets/javascripts/discourse/components/topic-closing.js.es6
index b92f7740358..f4ab5748ce4 100644
--- a/app/assets/javascripts/discourse/components/topic-closing.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-closing.js.es6
@@ -1,6 +1,6 @@
-import StringBuffer from 'discourse/mixins/string-buffer';
+import { bufferedRender } from 'discourse-common/lib/buffered-render';
-export default Ember.Component.extend(StringBuffer, {
+export default Ember.Component.extend(bufferedRender({
elementId: 'topic-closing-info',
delayedRerender: null,
@@ -9,7 +9,7 @@ export default Ember.Component.extend(StringBuffer, {
'topic.details.auto_close_based_on_last_post',
'topic.details.auto_close_hours'],
- renderString(buffer) {
+ buildBuffer(buffer) {
if (!!Ember.isEmpty(this.get('topic.details.auto_close_at'))) return;
if (this.get("topic.closed")) return;
@@ -48,4 +48,4 @@ export default Ember.Component.extend(StringBuffer, {
Em.run.cancel(this.get('delayedRerender'));
}
}
-});
+}));
diff --git a/app/assets/javascripts/discourse/components/topic-entrance.js.es6 b/app/assets/javascripts/discourse/components/topic-entrance.js.es6
new file mode 100644
index 00000000000..d3b5983ce43
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/topic-entrance.js.es6
@@ -0,0 +1,104 @@
+import DiscourseURL from 'discourse/lib/url';
+import CleansUp from 'discourse/mixins/cleans-up';
+import computed from 'ember-addons/ember-computed-decorators';
+
+function entranceDate(dt, showTime) {
+ const today = new Date();
+
+ if (dt.toDateString() === today.toDateString()) {
+ return moment(dt).format(I18n.t("dates.time"));
+ }
+
+ if (dt.getYear() === today.getYear()) {
+ // No year
+ return moment(dt).format(
+ showTime ? I18n.t("dates.long_date_without_year_with_linebreak") : I18n.t("dates.long_no_year_no_time")
+ );
+ }
+
+ return moment(dt).format(
+ showTime ? I18n.t('dates.long_date_with_year_with_linebreak') : I18n.t('dates.long_date_with_year_without_time')
+ );
+}
+
+export default Ember.Component.extend(CleansUp, {
+ elementId: 'topic-entrance',
+ classNameBindings: ['visible::hidden'],
+ _position: null,
+ topic: null,
+ visible: null,
+
+ @computed('topic.created_at')
+ createdDate: createdAt => new Date(createdAt),
+
+ @computed('topic.bumped_at')
+ bumpedDate: bumpedAt => new Date(bumpedAt),
+
+ @computed('createdDate', 'bumpedDate')
+ showTime(createdDate, bumpedDate) {
+ return bumpedDate.getTime() - createdDate.getTime() < (1000 * 60 * 60 * 24 * 2);
+ },
+
+ @computed('createdDate', 'showTime')
+ topDate: (createdDate, showTime) => entranceDate(createdDate, showTime),
+
+ @computed('bumpedDate', 'showTime')
+ bottomDate: (bumpedDate, showTime) => entranceDate(bumpedDate, showTime),
+
+ didInsertElement() {
+ this._super();
+ this.appEvents.on('topic-entrance:show', data => this._show(data));
+ },
+
+ _setCSS() {
+ const pos = this._position;
+ const $self = this.$();
+ const width = $self.width();
+ const height = $self.height();
+ pos.left = (parseInt(pos.left) - (width / 2));
+ pos.top = (parseInt(pos.top) - (height / 2));
+
+ const windowWidth = $(window).width();
+ if (pos.left + width > windowWidth) {
+ pos.left = (windowWidth - width) - 15;
+ }
+ $self.css(pos);
+ },
+
+ _show(data) {
+ this._position = data.position;
+
+ this.set('topic', data.topic);
+ this.set('visible', true);
+
+ Ember.run.scheduleOnce('afterRender', this, this._setCSS);
+
+ $('html').off('mousedown.topic-entrance').on('mousedown.topic-entrance', e => {
+ const $target = $(e.target);
+ if (($target.prop('id') === 'topic-entrance') || (this.$().has($target).length !== 0)) {
+ return;
+ }
+ this.cleanUp();
+ });
+ },
+
+ cleanUp() {
+ this.set('topic', null);
+ this.set('visible', false);
+ $('html').off('mousedown.topic-entrance');
+ },
+
+ willDestroyElement() {
+ this.appEvents.off('topic-entrance:show');
+ },
+
+ actions: {
+ enterTop() {
+ DiscourseURL.routeTo(this.get('topic.url'));
+ },
+
+ enterBottom() {
+ DiscourseURL.routeTo(this.get('topic.lastPostUrl'));
+ }
+ }
+});
diff --git a/app/assets/javascripts/discourse/components/topic-footer-buttons.js.es6 b/app/assets/javascripts/discourse/components/topic-footer-buttons.js.es6
index 1b41ae04dc2..13473c0e0f0 100644
--- a/app/assets/javascripts/discourse/components/topic-footer-buttons.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-footer-buttons.js.es6
@@ -1,23 +1,39 @@
-import ContainerView from 'discourse/views/container';
+import computed from 'ember-addons/ember-computed-decorators';
-export default ContainerView.extend({
+export default Ember.Component.extend({
elementId: 'topic-footer-buttons',
- init() {
- this._super();
+ // Allow us to extend it
+ layoutName: 'components/topic-footer-buttons',
- if (this.currentUser) {
- const viewArgs = this.getProperties('topic', 'topicDelegated');
- viewArgs.currentUser = this.currentUser;
+ @computed('topic.details.can_invite_to')
+ canInviteTo(result) {
+ return !this.site.mobileView && result;
+ },
- this.attachViewWithArgs(viewArgs, 'topic-footer-main-buttons');
- this.attachViewWithArgs(viewArgs, 'pinned-button');
- this.attachViewWithArgs(viewArgs, 'topic-notifications-button');
+ inviteDisabled: Ember.computed.or('topic.archived', 'topic.closed', 'topic.deleted'),
+
+ @computed
+ showAdminButton() {
+ return !this.site.mobileView && this.currentUser.get('canManageTopic');
+ },
+
+ @computed('topic.message_archived')
+ archiveIcon: archived => archived ? '' : 'folder',
+
+ @computed('topic.message_archived')
+ archiveTitle: archived => archived ? 'topic.move_to_inbox.help' : 'topic.archive_message.help',
+
+ @computed('topic.message_archived')
+ archiveLabel: archived => archived ? "topic.move_to_inbox.title" : "topic.archive_message.title",
+
+ @computed('topic.bookmarked')
+ bookmarkClass: bookmarked => bookmarked ? 'bookmark bookmarked' : 'bookmark',
+
+ @computed('topic.bookmarked')
+ bookmarkLabel: bookmarked => bookmarked ? 'bookmarked.clear_bookmarks' : 'bookmarked.title',
+
+ @computed('topic.bookmarked')
+ bookmarkTitle: bookmarked => bookmarked ? "bookmarked.help.unbookmark" : "bookmarked.help.bookmark",
- this.trigger('additionalButtons', this);
- } else {
- // If not logged in give them a login control
- this.attachViewClass('login-reply-button');
- }
- }
});
diff --git a/app/assets/javascripts/discourse/components/topic-footer-mobile-dropdown.js.es6 b/app/assets/javascripts/discourse/components/topic-footer-mobile-dropdown.js.es6
index bd7ce01b141..07ab1269982 100644
--- a/app/assets/javascripts/discourse/components/topic-footer-mobile-dropdown.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-footer-mobile-dropdown.js.es6
@@ -1,5 +1,5 @@
-import { iconHTML } from 'discourse/helpers/fa-icon';
-import Combobox from 'discourse/components/combo-box';
+import { iconHTML } from 'discourse-common/helpers/fa-icon';
+import Combobox from 'discourse-common/components/combo-box';
import { on, observes } from 'ember-addons/ember-computed-decorators';
export default Combobox.extend({
@@ -27,7 +27,7 @@ export default Combobox.extend({
}
this.comboTemplate = (item) => {
- const contentItem = content.findProperty('id', item.id);
+ const contentItem = content.findBy('id', item.id);
if (!contentItem) { return item.text; }
return `${iconHTML(contentItem.icon)} ${item.text}`;
};
@@ -38,7 +38,6 @@ export default Combobox.extend({
@observes('value')
_valueChanged() {
const value = this.get('value');
- const controller = this.get('parentView.controller');
const topic = this.get('topic');
const refresh = () => {
@@ -48,7 +47,7 @@ export default Combobox.extend({
switch(value) {
case 'invite':
- controller.send('showInvite');
+ this.attrs.showInvite();
refresh();
break;
case 'bookmark':
@@ -59,7 +58,7 @@ export default Combobox.extend({
refresh();
break;
case 'flag':
- controller.send('showFlagTopic', topic);
+ this.attrs.showFlagTopic();
refresh();
break;
}
diff --git a/app/assets/javascripts/discourse/components/topic-list-item.js.es6 b/app/assets/javascripts/discourse/components/topic-list-item.js.es6
index 28c00c4345b..9fdd978cd6c 100644
--- a/app/assets/javascripts/discourse/components/topic-list-item.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-list-item.js.es6
@@ -1,4 +1,6 @@
-import StringBuffer from 'discourse/mixins/string-buffer';
+import computed from 'ember-addons/ember-computed-decorators';
+import { bufferedRender } from 'discourse-common/lib/buffered-render';
+import { findRawTemplate } from 'discourse/lib/raw-templates';
export function showEntrance(e) {
let target = $(e.target);
@@ -10,28 +12,35 @@ export function showEntrance(e) {
target = target.end();
}
}
- this.container.lookup('controller:application').send("showTopicEntrance", {topic: this.get('topic'), position: target.offset()});
+
+ this.appEvents.trigger('topic-entrance:show', { topic: this.get('topic'), position: target.offset() });
return false;
}
}
-export default Ember.Component.extend(StringBuffer, {
+export default Ember.Component.extend(bufferedRender({
rerenderTriggers: ['bulkSelectEnabled', 'topic.pinned'],
tagName: 'tr',
- rawTemplate: 'list/topic-list-item.raw',
classNameBindings: [':topic-list-item', 'unboundClassNames'],
attributeBindings: ['data-topic-id'],
'data-topic-id': Em.computed.alias('topic.id'),
actions: {
toggleBookmark() {
- this.get('topic').toggleBookmark().finally(() => this.rerender());
+ this.get('topic').toggleBookmark().finally(() => this.rerenderBuffer());
}
},
- unboundClassNames: function() {
+ buildBuffer(buffer) {
+ const template = findRawTemplate('list/topic-list-item');
+ if (template) {
+ buffer.push(template(this));
+ }
+ },
+
+ @computed('topic', 'lastVisitedTopic')
+ unboundClassNames(topic, lastVisitedTopic) {
let classes = [];
- const topic = this.get('topic');
if (topic.get('category')) {
classes.push("category-" + topic.get('category.fullSlug'));
@@ -47,8 +56,12 @@ export default Ember.Component.extend(StringBuffer, {
}
});
+ if (topic === lastVisitedTopic) {
+ classes.push('last-visit');
+ }
+
return classes.join(' ');
- }.property(),
+ },
titleColSpan: function() {
return (!this.get('hideCategory') &&
@@ -113,22 +126,20 @@ export default Ember.Component.extend(StringBuffer, {
}
},
- highlight() {
+ highlight(opts = { isLastViewedTopic: false }) {
const $topic = this.$();
- const originalCol = $topic.css('backgroundColor');
$topic
.addClass('highlighted')
- .stop()
- .animate({ backgroundColor: originalCol }, 2500, 'swing', function() {
- $topic.removeClass('highlighted');
- });
+ .attr('data-islastviewedtopic', opts.isLastViewedTopic);
+
+ $topic.on('animationend', () => $topic.removeClass('highlighted'));
},
_highlightIfNeeded: function() {
// highlight the last topic viewed
if (this.session.get('lastTopicIdViewed') === this.get('topic.id')) {
this.session.set('lastTopicIdViewed', null);
- this.highlight();
+ this.highlight({ isLastViewedTopic: true });
} else if (this.get('topic.highlight')) {
// highlight new topics that have been loaded from the server or the one we just created
this.set('topic.highlight', false);
@@ -136,4 +147,4 @@ export default Ember.Component.extend(StringBuffer, {
}
}.on('didInsertElement')
-});
+}));
diff --git a/app/assets/javascripts/discourse/components/topic-list.js.es6 b/app/assets/javascripts/discourse/components/topic-list.js.es6
index cf0f7eb34f3..5b214be7aa7 100644
--- a/app/assets/javascripts/discourse/components/topic-list.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-list.js.es6
@@ -1,13 +1,15 @@
+import { observes } from 'ember-addons/ember-computed-decorators';
export default Ember.Component.extend({
tagName: 'table',
classNames: ['topic-list'],
showTopicPostBadges: true,
- _observeHideCategory: function(){
+ _init: function(){
this.addObserver('hideCategory', this.rerender);
this.addObserver('order', this.rerender);
this.addObserver('ascending', this.rerender);
+ this.refreshLastVisited();
}.on('init'),
toggleInTitle: function(){
@@ -30,9 +32,87 @@ export default Ember.Component.extend({
return this.get('order') === "op_likes";
}.property('order'),
+ @observes('topics.[]')
+ topicsAdded() {
+ // special case so we don't keep scanning huge lists
+ if (!this.get('lastVisitedTopic')) {
+ this.refreshLastVisited();
+ }
+ },
+
+ @observes('topics', 'order', 'ascending', 'category', 'top')
+ lastVisitedTopicChanged() {
+ this.refreshLastVisited();
+ },
+
+ _updateLastVisitedTopic(topics, order, ascending, top) {
+
+ this.set('lastVisitedTopic', null);
+
+ if (!this.get('highlightLastVisited')) {
+ return;
+ }
+
+ if (order !== "default" && order !== "activity") {
+ return;
+ }
+
+ if (top) {
+ return;
+ }
+
+ if (!topics || topics.length === 1) {
+ return;
+ }
+
+ if (ascending) {
+ return;
+ }
+
+ let user = Discourse.User.current();
+ if (!user || !user.previous_visit_at) {
+ return;
+ }
+
+ let lastVisitedTopic, topic;
+
+ let prevVisit = user.get('previousVisitAt');
+
+ // this is more efficient cause we keep appending to list
+ // work backwards
+ let start = 0;
+ while(topics[start] && topics[start].get('pinned')) {
+ start++;
+ }
+
+ let i;
+ for(i=topics.length-1;i>=start;i--){
+ if (topics[i].get('bumpedAt') > prevVisit) {
+ lastVisitedTopic = topics[i];
+ break;
+ }
+ topic = topics[i];
+ }
+
+ if (!lastVisitedTopic || !topic) {
+ return;
+ }
+
+ // end of list that was scanned
+ if (topic.get('bumpedAt') > prevVisit) {
+ return;
+ }
+
+ this.set('lastVisitedTopic', lastVisitedTopic);
+ },
+
+ refreshLastVisited() {
+ this._updateLastVisitedTopic(this.get('topics'), this.get('order'), this.get('ascending'), this.get('top'));
+ },
+
click(e) {
var self = this;
- var on = function(sel, callback){
+ var onClick = function(sel, callback){
var target = $(e.target).closest(sel);
if(target.length === 1){
@@ -40,12 +120,20 @@ export default Ember.Component.extend({
}
};
- on('button.bulk-select', function(){
+ onClick('button.bulk-select', function(){
this.sendAction('toggleBulkSelect');
this.rerender();
});
- on('th.sortable', function(e2){
+ onClick('button.bulk-select-all', function(){
+ $('input.bulk-select:not(:checked)').click();
+ });
+
+ onClick('button.bulk-clear-all', function(){
+ $('input.bulk-select:checked').click();
+ });
+
+ onClick('th.sortable', function(e2){
this.sendAction('changeSort', e2.data('sort-order'));
this.rerender();
});
diff --git a/app/assets/javascripts/discourse/components/topic-navigation.js.es6 b/app/assets/javascripts/discourse/components/topic-navigation.js.es6
index 945d14420e0..ecae615fc56 100644
--- a/app/assets/javascripts/discourse/components/topic-navigation.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-navigation.js.es6
@@ -1,17 +1,81 @@
+import { observes } from 'ember-addons/ember-computed-decorators';
+import showModal from 'discourse/lib/show-modal';
+
export default Ember.Component.extend({
composerOpen: null,
- classNameBindings: ['composerOpen'],
- showTimeline: null,
- info: null,
+ info: Em.Object.create(),
+
+ _performCheckSize() {
+ if (!this.element || this.isDestroying || this.isDestroyed) { return; }
+
+ let info = this.get('info');
+
+ if (info.get('topicProgressExpanded')) {
+
+ info.setProperties({
+ renderTimeline: true,
+ renderAdminMenuButton: true
+ });
+
+ } else {
+
+ let renderTimeline = !this.site.mobileView;
+
+ if (renderTimeline) {
+
+ const width = $(window).width();
+ let height = $(window).height();
+
+ if (this.get('composerOpen')) {
+ height -= $('#reply-control').height();
+ }
+
+ renderTimeline = width > 960 && height > 520;
+ }
+
+ info.setProperties({
+ renderTimeline,
+ renderAdminMenuButton: !renderTimeline
+ });
+ }
+ },
_checkSize() {
- const renderTimeline = $(window).width() > 960;
- this.set('info', { renderTimeline, showTimeline: renderTimeline && !this.get('composerOpen') });
+ Ember.run.scheduleOnce('afterRender', this, this._performCheckSize);
+ },
+
+ // we need to store this so topic progress has something to init with
+ _topicScrolled(event) {
+ this.set('info.prevEvent', event);
+ },
+
+ @observes('info.topicProgressExpanded')
+ _expanded() {
+ if (this.get('info.topicProgressExpanded')) {
+ $(window).on('click.hide-fullscreen', (e) => {
+ let $target = $(e.target);
+ let $parents = $target.parents();
+ if ( !$target.is('.widget-button') &&
+ !$parents.is('.widget-button') &&
+ !$parents.is('.dropdown-menu') &&
+ (
+ $target.is('.topic-timeline') ||
+ !$parents.is('#topic-progress-wrapper')
+ )
+ ) {
+ this._collapseFullscreen();
+ }
+ });
+ } else {
+ $(window).off('click.hide-fullscreen');
+ }
+ this._checkSize();
},
composerOpened() {
this.set('composerOpen', true);
- this._checkSize();
+ // we need to do the check after animation is done
+ Ember.run.later(() => this._checkSize(), 500);
},
composerClosed() {
@@ -19,25 +83,60 @@ export default Ember.Component.extend({
this._checkSize();
},
+ _collapseFullscreen() {
+ if (this.get('info.topicProgressExpanded')) {
+ $('.timeline-fullscreen').removeClass('show');
+ setTimeout(() => {
+ this.set('info.topicProgressExpanded', false);
+ this._checkSize();
+ },500);
+ }
+ },
+
+ keyboardTrigger(e) {
+ if (e.type === "jump") {
+ const controller = showModal('jump-to-post');
+ controller.setProperties({
+ topic: this.get('topic'),
+ postNumber: 1,
+ jumpToIndex: this.attrs.jumpToIndex
+ });
+ }
+ },
+
didInsertElement() {
this._super();
+ this.appEvents
+ .on('topic:current-post-scrolled', this, this._topicScrolled)
+ .on('topic:jump-to-post', this, this._collapseFullscreen)
+ .on('topic:keyboard-trigger', this, this.keyboardTrigger);
+
if (!this.site.mobileView) {
$(window).on('resize.discourse-topic-navigation', () => this._checkSize());
this.appEvents.on('composer:will-open', this, this.composerOpened);
this.appEvents.on('composer:will-close', this, this.composerClosed);
- this._checkSize();
- } else {
- this.set('info', null);
+ $('#reply-control').on('div-resized.discourse-topic-navigation', () => this._checkSize());
}
+
+ this._checkSize();
},
willDestroyElement() {
this._super();
+
+ this.appEvents
+ .off('topic:current-post-scrolled', this, this._topicScrolled)
+ .off('topic:jump-to-post', this, this._collapseFullscreen)
+ .off('topic:keyboard-trigger', this, this.keyboardTrigger);
+
+ $(window).off('click.hide-fullscreen');
+
if (!this.site.mobileView) {
$(window).off('resize.discourse-topic-navigation');
this.appEvents.off('composer:will-open', this, this.composerOpened);
this.appEvents.off('composer:will-close', this, this.composerClosed);
+ $('#reply-control').off('div-resized.discourse-topic-navigation');
}
}
});
diff --git a/app/assets/javascripts/discourse/components/topic-post-badges.js.es6 b/app/assets/javascripts/discourse/components/topic-post-badges.js.es6
index ff9b0131e4d..9eb07ade4fb 100644
--- a/app/assets/javascripts/discourse/components/topic-post-badges.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-post-badges.js.es6
@@ -1,23 +1,21 @@
-import StringBuffer from 'discourse/mixins/string-buffer';
+import { bufferedRender } from 'discourse-common/lib/buffered-render';
// Creates a link
function link(buffer, prop, url, cssClass, i18nKey, text) {
if (!prop) { return; }
-
- var title = I18n.t("topic." + i18nKey, {count: prop});
- buffer.push("" + (text || prop) + "\n");
+ const title = I18n.t("topic." + i18nKey, { count: prop });
+ buffer.push(`${text || prop}\n`);
}
-export default Ember.Component.extend(StringBuffer, {
+export default Ember.Component.extend(bufferedRender({
tagName: 'span',
classNameBindings: [':topic-post-badges'],
rerenderTriggers: ['url', 'unread', 'newPosts', 'unseen'],
- renderString: function(buffer) {
- var url = this.get('url');
-
+ buildBuffer(buffer) {
+ const url = this.get('url');
link(buffer, this.get('unread'), url, 'unread', 'unread_posts');
link(buffer, this.get('newPosts'), url, 'new-posts', 'new_posts');
link(buffer, this.get('unseen'), url, 'new-topic', 'new', I18n.t('filters.new.lower_title'));
}
-});
+}));
diff --git a/app/assets/javascripts/discourse/components/topic-progress.js.es6 b/app/assets/javascripts/discourse/components/topic-progress.js.es6
index 86533ed6a65..f20f47426d7 100644
--- a/app/assets/javascripts/discourse/components/topic-progress.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-progress.js.es6
@@ -2,40 +2,12 @@ import { default as computed, observes } from 'ember-addons/ember-computed-decor
export default Ember.Component.extend({
elementId: 'topic-progress-wrapper',
- classNameBindings: ['docked', 'hidden'],
- expanded: false,
- toPostIndex: null,
+ classNameBindings: ['docked'],
docked: false,
progressPosition: null,
postStream: Ember.computed.alias('topic.postStream'),
- userWantsToJump: null,
_streamPercentage: null,
- init() {
- this._super();
- (this.get('delegated') || []).forEach(m => this.set(m, m));
- },
-
- @computed('userWantsToJump', 'showTimeline')
- hidden(userWantsToJump, showTimeline) {
- return !userWantsToJump && showTimeline;
- },
-
- @observes('hidden')
- visibilityChanged() {
- if (!this.get('hidden')) {
- this._updateBar();
- }
- },
-
- keyboardTrigger(kbdEvent) {
- if (kbdEvent.type === 'jump') {
- this.set('expanded', true);
- this.set('userWantsToJump', true);
- Ember.run.scheduleOnce('afterRender', () => this.$('.jump-form input').focus());
- }
- },
-
@computed('progressPosition')
jumpTopDisabled(progressPosition) {
return progressPosition <= 3;
@@ -65,6 +37,15 @@ export default Ember.Component.extend({
}
},
+ @computed('progressPosition', 'topic.last_read_post_id')
+ showBackButton(position, lastReadId) {
+ if (!lastReadId) { return; }
+
+ const stream = this.get('postStream.stream');
+ const readPos = stream.indexOf(lastReadId) || 0;
+ return (readPos < (stream.length - 1)) && (readPos > position);
+ },
+
@observes('postStream.stream.[]')
_updateBar() {
Ember.run.scheduleOnce('afterRender', this, this._updateProgressBar);
@@ -83,10 +64,15 @@ export default Ember.Component.extend({
.on("composer:resized", this, this._dock)
.on('composer:closed', this, this._dock)
.on("topic:scrolled", this, this._dock)
- .on('topic:current-post-scrolled', this, this._topicScrolled)
- .on('topic-progress:keyboard-trigger', this, this.keyboardTrigger);
+ .on('topic:current-post-scrolled', this, this._topicScrolled);
- Ember.run.scheduleOnce('afterRender', this, this._updateProgressBar);
+ const prevEvent = this.get('prevEvent');
+ if (prevEvent) {
+ Ember.run.scheduleOnce('afterRender', this, this._topicScrolled, prevEvent);
+ } else {
+ Ember.run.scheduleOnce('afterRender', this, this._updateProgressBar);
+ }
+ Ember.run.scheduleOnce('afterRender', this, this._dock);
},
willDestroyElement() {
@@ -95,12 +81,11 @@ export default Ember.Component.extend({
.off("composer:resized", this, this._dock)
.off('composer:closed', this, this._dock)
.off('topic:scrolled', this, this._dock)
- .off('topic:current-post-scrolled', this, this._topicScrolled)
- .off('topic-progress:keyboard-trigger');
+ .off('topic:current-post-scrolled', this, this._topicScrolled);
},
_updateProgressBar() {
- if (this.isDestroyed || this.isDestroying || this.get('hidden')) { return; }
+ if (this.isDestroyed || this.isDestroying) { return; }
const $topicProgress = this.$('#topic-progress');
// speeds up stuff, bypass jquery slowness and extra checks
@@ -127,6 +112,10 @@ export default Ember.Component.extend({
offset = window.pageYOffset || $('html').scrollTop(),
topicProgressHeight = $('#topic-progress').height();
+ if (!$topicProgressWrapper || $topicProgressWrapper.length === 0) {
+ return;
+ }
+
let isDocked = false;
if (maximumOffset) {
const threshold = maximumOffset.top;
@@ -156,71 +145,15 @@ export default Ember.Component.extend({
}
},
- keyDown(e) {
- if (this.get('expanded')) {
- if (e.keyCode === 13) {
- this.$('input').blur();
- this.send('jumpPost');
- } else if (e.keyCode === 27) {
- this.send('toggleExpansion');
- this.set('userWantsToJump', false);
- }
- }
- },
-
- _jumpTo(postIndex) {
- postIndex = parseInt(postIndex, 10);
-
- // Validate the post index first
- if (isNaN(postIndex) || postIndex < 1) {
- postIndex = 1;
- }
- if (postIndex > this.get('postStream.filteredPostsCount')) {
- postIndex = this.get('postStream.filteredPostsCount');
- }
- this.set('toPostIndex', postIndex);
- this._beforeJump();
- this.sendAction('jumpToIndex', postIndex);
- },
actions: {
- toggleExpansion(opts) {
+ toggleExpansion() {
this.toggleProperty('expanded');
- if (this.get('expanded')) {
- this.set('userWantsToJump', false);
- this.set('toPostIndex', this.get('progressPosition'));
- if (opts && opts.highlight) {
- Ember.run.next(() => $('.jump-form input').select().focus());
- }
- if (!this.site.mobileView && !this.capabilities.isIOS) {
- Ember.run.schedule('afterRender', () => this.$('input').focus());
- }
- }
},
- jumpPrompt() {
- const postIndex = prompt(I18n.t('topic.progress.jump_prompt_long'));
- if (postIndex === null) { return; }
- this._jumpTo(postIndex);
- },
-
- jumpPost() {
- this._jumpTo(this.get('toPostIndex'));
- },
-
- jumpTop() {
- this._beforeJump();
- this.sendAction('jumpTop');
- },
-
- jumpBottom() {
- this._beforeJump();
- this.sendAction('jumpBottom');
+ goBack() {
+ this.attrs.jumpToPost(this.get('topic.last_read_post_number'));
}
},
- _beforeJump() {
- this.set('expanded', false);
- this.set('userWantsToJump', false);
- }
});
diff --git a/app/assets/javascripts/discourse/components/topic-status.js.es6 b/app/assets/javascripts/discourse/components/topic-status.js.es6
index e8fc527cceb..bede7d57a6a 100644
--- a/app/assets/javascripts/discourse/components/topic-status.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-status.js.es6
@@ -1,8 +1,8 @@
-import { iconHTML } from 'discourse/helpers/fa-icon';
-import StringBuffer from 'discourse/mixins/string-buffer';
+import { iconHTML } from 'discourse-common/helpers/fa-icon';
+import { bufferedRender } from 'discourse-common/lib/buffered-render';
import { escapeExpression } from 'discourse/lib/utilities';
-export default Ember.Component.extend(StringBuffer, {
+export default Ember.Component.extend(bufferedRender({
classNames: ['topic-statuses'],
rerenderTriggers: ['topic.archived', 'topic.closed', 'topic.pinned', 'topic.visible', 'topic.unpinned', 'topic.is_warning'],
@@ -26,9 +26,7 @@ export default Ember.Component.extend(StringBuffer, {
return Discourse.User.current() && !this.get('disableActions');
}.property('disableActions'),
- renderString(buffer) {
- const self = this;
-
+ buildBuffer(buffer) {
const renderIcon = function(name, key, actionable) {
const title = escapeExpression(I18n.t(`topic_statuses.${key}.help`)),
startTag = actionable ? "a href" : "span",
@@ -39,8 +37,8 @@ export default Ember.Component.extend(StringBuffer, {
buffer.push(`<${startTag} title='${title}' class='topic-status'>${icon}`);
};
- const renderIconIf = function(conditionProp, name, key, actionable) {
- if (!self.get(conditionProp)) { return; }
+ const renderIconIf = (conditionProp, name, key, actionable) => {
+ if (!this.get(conditionProp)) { return; }
renderIcon(name, key, actionable);
};
@@ -57,4 +55,4 @@ export default Ember.Component.extend(StringBuffer, {
renderIconIf('topic.unpinned', 'thumb-tack', 'unpinned', this.get("canAct"));
renderIconIf('topic.invisible', 'eye-slash', 'invisible');
}
-});
+}));
diff --git a/app/assets/javascripts/discourse/components/topic-timeline.js.es6 b/app/assets/javascripts/discourse/components/topic-timeline.js.es6
index d3b2f648a47..eaa065857cb 100644
--- a/app/assets/javascripts/discourse/components/topic-timeline.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-timeline.js.es6
@@ -10,12 +10,28 @@ export default MountWidget.extend(Docking, {
dockAt: null,
buildArgs() {
- return { topic: this.get('topic'),
- topicTrackingState: this.topicTrackingState,
- enteredIndex: this.get('enteredIndex'),
- dockAt: this.dockAt,
- top: this.dockAt || FIXED_POS,
- dockBottom: this.dockBottom };
+ let attrs = {
+ topic: this.get('topic'),
+ topicTrackingState: this.topicTrackingState,
+ enteredIndex: this.get('enteredIndex'),
+ dockBottom: this.dockBottom,
+ mobileView: this.get('site.mobileView')
+ };
+
+ let event = this.get('prevEvent');
+ if (event) {
+ attrs.enteredIndex = event.postIndex-1;
+ }
+
+ if (this.get('fullscreen')) {
+ attrs.fullScreen = true;
+ attrs.addShowClass = this.get('addShowClass');
+ } else {
+ attrs.dockAt = this.dockAt;
+ attrs.top = this.dockAt || FIXED_POS;
+ }
+
+ return attrs;
},
@observes('topic.highest_post_number', 'loading')
@@ -54,6 +70,15 @@ export default MountWidget.extend(Docking, {
didInsertElement() {
this._super();
+
+ if (this.get('fullscreen') && !this.get('addShowClass')) {
+ Em.run.next(()=>{
+ this.set('addShowClass', true);
+ this.queueRerender();
+ });
+ }
+
this.dispatch('topic:current-post-scrolled', 'timeline-scrollarea');
+ this.dispatch('topic-notifications-button:keyboard-trigger', 'topic-notifications-button');
}
});
diff --git a/app/assets/javascripts/discourse/components/user-card-contents.js.es6 b/app/assets/javascripts/discourse/components/user-card-contents.js.es6
new file mode 100644
index 00000000000..81d7e5c93e8
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/user-card-contents.js.es6
@@ -0,0 +1,271 @@
+import { wantsNewWindow } from 'discourse/lib/intercept-click';
+import { propertyNotEqual, setting } from 'discourse/lib/computed';
+import CleansUp from 'discourse/mixins/cleans-up';
+import afterTransition from 'discourse/lib/after-transition';
+import { default as computed, observes } from 'ember-addons/ember-computed-decorators';
+import DiscourseURL from 'discourse/lib/url';
+import User from 'discourse/models/user';
+
+const clickOutsideEventName = "mousedown.outside-user-card";
+const clickDataExpand = "click.discourse-user-card";
+const clickMention = "click.discourse-user-mention";
+
+export default Ember.Component.extend(CleansUp, {
+ elementId: 'user-card',
+ classNameBindings: ['visible:show', 'showBadges', 'hasCardBadgeImage', 'user.card_background::no-bg'],
+ allowBackgrounds: setting('allow_profile_backgrounds'),
+
+ postStream: Ember.computed.alias('topic.postStream'),
+ enoughPostsForFiltering: Ember.computed.gte('topicPostCount', 2),
+ viewingTopic: Ember.computed.match('currentPath', /^topic\./),
+ viewingAdmin: Ember.computed.match('currentPath', /^admin\./),
+ showFilter: Ember.computed.and('viewingTopic', 'postStream.hasNoFilters', 'enoughPostsForFiltering'),
+ showName: propertyNotEqual('user.name', 'user.username'),
+ hasUserFilters: Ember.computed.gt('postStream.userFilters.length', 0),
+ isSuspended: Ember.computed.notEmpty('user.suspend_reason'),
+ showBadges: setting('enable_badges'),
+ showMoreBadges: Ember.computed.gt('moreBadgesCount', 0),
+ showDelete: Ember.computed.and("viewingAdmin", "showName", "user.canBeDeleted"),
+ linkWebsite: Ember.computed.not('user.isBasic'),
+ hasLocationOrWebsite: Ember.computed.or('user.location', 'user.website_name'),
+
+ visible: false,
+ user: null,
+ username: null,
+ avatar: null,
+ userLoading: null,
+ cardTarget: null,
+ post: null,
+
+ // If inside a topic
+ topicPostCount: null,
+
+ @computed('user.name')
+ nameFirst(name) {
+ return !this.siteSettings.prioritize_username_in_ux && name && name.trim().length > 0;
+ },
+
+ @computed('user.user_fields.@each.value')
+ publicUserFields() {
+ const siteUserFields = this.site.get('user_fields');
+ if (!Ember.isEmpty(siteUserFields)) {
+ const userFields = this.get('user.user_fields');
+ return siteUserFields.filterBy('show_on_user_card', true).sortBy('position').map(field => {
+ Ember.set(field, 'dasherized_name', field.get('name').dasherize());
+ const value = userFields ? userFields[field.get('id')] : null;
+ return Ember.isEmpty(value) ? null : Ember.Object.create({ value, field });
+ }).compact();
+ }
+ },
+
+ @computed("user.trust_level")
+ removeNoFollow(trustLevel) {
+ return trustLevel > 2 && !this.siteSettings.tl3_links_no_follow;
+ },
+
+ @computed('user.badge_count', 'user.featured_user_badges.length')
+ moreBadgesCount: (badgeCount, badgeLength) => badgeCount - badgeLength,
+
+ @computed('user.card_badge.image')
+ hasCardBadgeImage: image => image && image.indexOf('fa-') !== 0,
+
+ @observes('user.card_background')
+ addBackground() {
+ if (!this.get('allowBackgrounds')) { return; }
+
+ const $this = this.$();
+ if (!$this) { return; }
+
+ const url = this.get('user.card_background');
+ const bg = Ember.isEmpty(url) ? '' : `url(${Discourse.getURLWithCDN(url)})`;
+ $this.css('background-image', bg);
+ },
+
+ _show(username, $target) {
+ // No user card for anon
+ if (this.siteSettings.hide_user_profiles_from_public && !this.currentUser) {
+ return true;
+ }
+
+ // XSS protection (should be encapsulated)
+ username = username.toString().replace(/[^A-Za-z0-9_\.\-]/g, "");
+
+ // Don't show on mobile
+ if (this.site.mobileView) {
+ DiscourseURL.routeTo(`/users/${username}`);
+ return false;
+ }
+
+ const currentUsername = this.get('username');
+ if (username === currentUsername && this.get('userLoading') === username) {
+ return;
+ }
+
+ const postId = $target.parents('article').data('post-id');
+
+ const wasVisible = this.get('visible');
+ const previousTarget = this.get('cardTarget');
+ const target = $target[0];
+ if (wasVisible) {
+ this._close();
+ if (target === previousTarget) { return; }
+ }
+
+ const post = this.get('viewingTopic') && postId ? this.get('postStream').findLoadedPost(postId) : null;
+ this.setProperties({ username, userLoading: username, cardTarget: target, post });
+
+ const args = { stats: false };
+ args.include_post_count_for = this.get('topic.id');
+ args.skip_track_visit = true;
+
+ User.findByUsername(username, args).then(user => {
+ if (user.topic_post_count) {
+ this.set('topicPostCount', user.topic_post_count[args.include_post_count_for]);
+ }
+ this.setProperties({ user, avatar: user, visible: true });
+
+ this._positionCard($target);
+ }).catch(() => this._close()).finally(() => this.set('userLoading', null));
+
+ return false;
+ },
+
+ didInsertElement() {
+ this._super();
+ afterTransition(this.$(), this._hide.bind(this));
+
+ $('html').off(clickOutsideEventName)
+ .on(clickOutsideEventName, (e) => {
+ if (this.get('visible')) {
+ const $target = $(e.target);
+ if ($target.closest('[data-user-card]').data('userCard') ||
+ $target.closest('a.mention').length > 0 ||
+ $target.closest('#user-card').length > 0) {
+ return;
+ }
+
+ this._close();
+ }
+
+ return true;
+ });
+
+ $('#main-outlet').on(clickDataExpand, '[data-user-card]', (e) => {
+ if (wantsNewWindow(e)) { return; }
+ const $target = $(e.currentTarget);
+ return this._show($target.data('user-card'), $target);
+ });
+
+ $('#main-outlet').on(clickMention, 'a.mention', (e) => {
+ if (wantsNewWindow(e)) { return; }
+ const $target = $(e.target);
+ return this._show($target.text().replace(/^@/, ''), $target);
+ });
+ },
+
+ _positionCard(target) {
+ const rtl = ($('html').css('direction')) === 'rtl';
+ if (!target) { return; }
+ const width = this.$().width();
+
+ Ember.run.schedule('afterRender', () => {
+ if (target) {
+ let position = target.offset();
+ if (position) {
+
+ if (rtl) { // The site direction is rtl
+ position.right = $(window).width() - position.left + 10;
+ position.left = 'auto';
+ let overage = ($(window).width() - 50) - (position.right + width);
+ if (overage < 0) {
+ position.right += overage;
+ position.top += target.height() + 48;
+ }
+ } else { // The site direction is ltr
+ position.left += target.width() + 10;
+
+ let overage = ($(window).width() - 50) - (position.left + width);
+ if (overage < 0) {
+ position.left += overage;
+ position.top += target.height() + 48;
+ }
+ }
+
+ position.top -= $('#main-outlet').offset().top;
+ this.$().css(position);
+ }
+
+ // After the card is shown, focus on the first link
+ //
+ // note: we DO NOT use afterRender here cause _positionCard may
+ // run afterwards, if we allowed this to happen the usercard
+ // may be offscreen and we may scroll all the way to it on focus
+ Ember.run.next(null, () => this.$('a:first').focus() );
+ }
+ });
+ },
+
+ _hide() {
+ if (!this.get('visible')) {
+ this.$().css({left: -9999, top: -9999});
+ }
+ },
+
+ _close() {
+ this.setProperties({
+ visible: false,
+ user: null,
+ username: null,
+ avatar: null,
+ userLoading: null,
+ cardTarget: null,
+ post: null,
+ topicPostCount: null
+ });
+ },
+
+ cleanUp() {
+ this._close();
+ },
+
+ keyUp(e) {
+ if (e.keyCode === 27) { // ESC
+ const target = this.get('cardTarget');
+ this._close();
+ target.focus();
+ }
+ },
+
+ willDestroyElement() {
+ this._super();
+ $('html').off(clickOutsideEventName);
+ $('#main').off(clickDataExpand).off(clickMention);
+ },
+
+ actions: {
+ cancelFilter() {
+ const postStream = this.get('postStream');
+ postStream.cancelFilter();
+ postStream.refresh();
+ this._close();
+ },
+
+ composePrivateMessage(...args) {
+ this.sendAction('composePrivateMessage', ...args);
+ },
+
+ togglePosts() {
+ this.sendAction('togglePosts', this.get('user'));
+ this._close();
+ },
+
+ deleteUser() {
+ this.sendAction('deleteUser', this.get('user'));
+ },
+
+ showUser() {
+ this.sendAction('showUser', this.get('user'));
+ this._close();
+ }
+ }
+});
diff --git a/app/assets/javascripts/discourse/components/user-selector.js.es6 b/app/assets/javascripts/discourse/components/user-selector.js.es6
index 862f0fae491..5fda51dec6f 100644
--- a/app/assets/javascripts/discourse/components/user-selector.js.es6
+++ b/app/assets/javascripts/discourse/components/user-selector.js.es6
@@ -1,10 +1,16 @@
import { observes } from 'ember-addons/ember-computed-decorators';
import TextField from 'discourse/components/text-field';
import userSearch from 'discourse/lib/user-search';
+import { findRawTemplate } from 'discourse/lib/raw-templates';
export default TextField.extend({
+ @observes('usernames')
+ _update() {
+ if (this.get('canReceiveUpdates') === 'true')
+ this.didInsertElement({updateData: true});
+ },
- didInsertElement() {
+ didInsertElement(opts) {
this._super();
var self = this,
selected = [],
@@ -25,10 +31,11 @@ export default TextField.extend({
}
this.$().val(this.get('usernames')).autocomplete({
- template: this.container.lookup('template:user-selector-autocomplete.raw'),
+ template: findRawTemplate('user-selector-autocomplete'),
disabled: this.get('disabled'),
single: this.get('single'),
allowAny: this.get('allowAny'),
+ updateData: (opts && opts.updateData) ? opts.updateData : false,
dataSource: function(term) {
var results = userSearch({
diff --git a/app/assets/javascripts/discourse/components/visible.js.es6 b/app/assets/javascripts/discourse/components/visible.js.es6
deleted file mode 100644
index f9570e412ea..00000000000
--- a/app/assets/javascripts/discourse/components/visible.js.es6
+++ /dev/null
@@ -1,12 +0,0 @@
-export default Ember.Component.extend({
- visibleChanged: function(){
- this.rerender();
- }.observes("visible"),
-
- render: function(buffer){
- if (this._state !== 'inDOM' && this._state !== 'preRender' && this._state !== 'inBuffer') { return; }
- if (!this.get("visible")) { return; }
-
- return this._super(buffer);
- }
-});
diff --git a/app/assets/javascripts/discourse/components/watch-read.js.es6 b/app/assets/javascripts/discourse/components/watch-read.js.es6
new file mode 100644
index 00000000000..2a92380cbec
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/watch-read.js.es6
@@ -0,0 +1,24 @@
+import isElementInViewport from "discourse/lib/is-element-in-viewport";
+
+export default Ember.Component.extend({
+ didInsertElement() {
+ this._super();
+ const currentUser = this.currentUser;
+ if (!currentUser) { return; }
+
+ const path = this.get('path');
+ if (path === "faq" || path === "guidelines") {
+ $(window).on('load.faq resize.faq scroll.faq', () => {
+ const faqUnread = !currentUser.get('read_faq');
+ if (faqUnread && isElementInViewport($(".contents p").last())) {
+ this.sendAction();
+ }
+ });
+ }
+ },
+
+ willDestroyElement() {
+ this._super();
+ $(window).off('load.faq resize.faq scroll.faq');
+ }
+});
diff --git a/app/assets/javascripts/discourse/controllers/application.js.es6 b/app/assets/javascripts/discourse/controllers/application.js.es6
index dc9f45d3220..78402acd259 100644
--- a/app/assets/javascripts/discourse/controllers/application.js.es6
+++ b/app/assets/javascripts/discourse/controllers/application.js.es6
@@ -15,4 +15,10 @@ export default Ember.Controller.extend({
loginRequired() {
return Discourse.SiteSettings.login_required && !Discourse.User.current();
},
+
+ actions: {
+ appRouteAction(name) {
+ return this.send(name);
+ }
+ }
});
diff --git a/app/assets/javascripts/discourse/controllers/avatar-selector.js.es6 b/app/assets/javascripts/discourse/controllers/avatar-selector.js.es6
index a39c7deacdc..ab30fef1572 100644
--- a/app/assets/javascripts/discourse/controllers/avatar-selector.js.es6
+++ b/app/assets/javascripts/discourse/controllers/avatar-selector.js.es6
@@ -1,5 +1,6 @@
import computed from "ember-addons/ember-computed-decorators";
import ModalFunctionality from "discourse/mixins/modal-functionality";
+import { ajax } from 'discourse/lib/ajax';
import { allowsImages } from 'discourse/lib/utilities';
@@ -28,14 +29,13 @@ export default Ember.Controller.extend(ModalFunctionality, {
},
actions: {
- useUploadedAvatar() { this.set("selected", "uploaded"); },
- useGravatar() { this.set("selected", "gravatar"); },
- useSystem() { this.set("selected", "system"); },
+ uploadComplete() {
+ this.set("selected", "uploaded");
+ },
refreshGravatar() {
this.set("gravatarRefreshDisabled", true);
- return Discourse
- .ajax(`/user_avatar/${this.get("username")}/refresh_gravatar.json`, { method: "POST" })
+ return ajax(`/user_avatar/${this.get("username")}/refresh_gravatar.json`, { method: "POST" })
.then(result => this.setProperties({
gravatar_avatar_template: result.gravatar_avatar_template,
gravatar_avatar_upload_id: result.gravatar_upload_id,
diff --git a/app/assets/javascripts/discourse/controllers/badges/show.js.es6 b/app/assets/javascripts/discourse/controllers/badges/show.js.es6
index 086e353c07b..f7f79f14c48 100644
--- a/app/assets/javascripts/discourse/controllers/badges/show.js.es6
+++ b/app/assets/javascripts/discourse/controllers/badges/show.js.es6
@@ -5,7 +5,7 @@ export default Ember.Controller.extend({
queryParams: ['username'],
noMoreBadges: false,
userBadges: null,
- needs: ["application"],
+ application: Ember.inject.controller(),
@computed('username')
user(username) {
@@ -55,7 +55,7 @@ export default Ember.Controller.extend({
@observes('canLoadMore')
_showFooter() {
- this.set("controllers.application.showFooter", !this.get("canLoadMore"));
+ this.set("application.showFooter", !this.get("canLoadMore"));
}
});
diff --git a/app/assets/javascripts/discourse/controllers/bulk-notification-level.js.es6 b/app/assets/javascripts/discourse/controllers/bulk-notification-level.js.es6
index d4a3ebbd2ad..cd0cf9c11b5 100644
--- a/app/assets/javascripts/discourse/controllers/bulk-notification-level.js.es6
+++ b/app/assets/javascripts/discourse/controllers/bulk-notification-level.js.es6
@@ -3,7 +3,7 @@ import { topicLevels } from 'discourse/lib/notification-levels';
// Support for changing the notification level of various topics
export default Ember.Controller.extend({
- needs: ['topic-bulk-actions'],
+ topicBulkActions: Ember.inject.controller(),
notificationLevelId: null,
@computed
@@ -21,7 +21,7 @@ export default Ember.Controller.extend({
actions: {
changeNotificationLevel() {
- this.get('controllers.topic-bulk-actions').performAndRefresh({
+ this.get('topicBulkActions').performAndRefresh({
type: 'change_notification_level',
notification_level_id: this.get('notificationLevelId')
});
diff --git a/app/assets/javascripts/discourse/controllers/change-owner.js.es6 b/app/assets/javascripts/discourse/controllers/change-owner.js.es6
index 532b21a0bbb..84c323b88a6 100644
--- a/app/assets/javascripts/discourse/controllers/change-owner.js.es6
+++ b/app/assets/javascripts/discourse/controllers/change-owner.js.es6
@@ -4,9 +4,7 @@ import DiscourseURL from 'discourse/lib/url';
// Modal related to changing the ownership of posts
export default Ember.Controller.extend(SelectedPostsCount, ModalFunctionality, {
- needs: ['topic'],
-
- topicController: Em.computed.alias('controllers.topic'),
+ topicController: Ember.inject.controller('topic'),
selectedPosts: Em.computed.alias('topicController.selectedPosts'),
saving: false,
new_user: null,
diff --git a/app/assets/javascripts/discourse/controllers/change-timestamp.js.es6 b/app/assets/javascripts/discourse/controllers/change-timestamp.js.es6
index 1cd859cfa68..c24cf785c90 100644
--- a/app/assets/javascripts/discourse/controllers/change-timestamp.js.es6
+++ b/app/assets/javascripts/discourse/controllers/change-timestamp.js.es6
@@ -4,9 +4,8 @@ import DiscourseURL from 'discourse/lib/url';
// Modal related to changing the timestamp of posts
export default Ember.Controller.extend(ModalFunctionality, {
- needs: ['topic'],
- topicController: Em.computed.alias('controllers.topic'),
+ topicController: Ember.inject.controller('topic'),
saving: false,
date: '',
time: '',
diff --git a/app/assets/javascripts/discourse/controllers/composer.js.es6 b/app/assets/javascripts/discourse/controllers/composer.js.es6
index b89d61a98b1..c5e69a45a17 100644
--- a/app/assets/javascripts/discourse/controllers/composer.js.es6
+++ b/app/assets/javascripts/discourse/controllers/composer.js.es6
@@ -4,8 +4,10 @@ import Draft from 'discourse/models/draft';
import Composer from 'discourse/models/composer';
import { default as computed, observes } from 'ember-addons/ember-computed-decorators';
import { relativeAge } from 'discourse/lib/formatter';
-import { escapeExpression } from 'discourse/lib/utilities';
import InputValidation from 'discourse/models/input-validation';
+import { getOwner } from 'discourse-common/lib/get-owner';
+import { escapeExpression } from 'discourse/lib/utilities';
+import { emojiUnescape } from 'discourse/lib/text';
function loadDraft(store, opts) {
opts = opts || {};
@@ -51,7 +53,9 @@ export function addPopupMenuOptionsCallback(callback) {
}
export default Ember.Controller.extend({
- needs: ['modal', 'topic', 'application'],
+ topicController: Ember.inject.controller('topic'),
+ application: Ember.inject.controller(),
+
replyAsNewTopicDraft: Em.computed.equal('model.draftKey', Composer.REPLY_AS_NEW_TOPIC_KEY),
checkedMessages: false,
messageCount: null,
@@ -69,7 +73,9 @@ export default Ember.Controller.extend({
focusTarget(replyingToTopic, creatingPM, usernames) {
if (this.capabilities.isIOS) { return "none"; }
- if (creatingPM && usernames === this.currentUser.get('username')) {
+ // Focus on usernames if it's blank or if it's just you
+ usernames = usernames || "";
+ if (creatingPM && usernames.length === 0 || usernames === this.currentUser.get('username')) {
return 'usernames';
}
@@ -81,8 +87,8 @@ export default Ember.Controller.extend({
},
showToolbar: Em.computed({
- get(){
- const keyValueStore = this.container.lookup('key-value-store:main');
+ get() {
+ const keyValueStore = getOwner(this).lookup('key-value-store:main');
const storedVal = keyValueStore.get("toolbar-enabled");
if (this._toolbarEnabled === undefined && storedVal === undefined) {
// iPhone 6 is 375, anything narrower and toolbar should
@@ -93,14 +99,14 @@ export default Ember.Controller.extend({
return this._toolbarEnabled || storedVal === "true";
},
set(key, val){
- const keyValueStore = this.container.lookup('key-value-store:main');
+ const keyValueStore = getOwner(this).lookup('key-value-store:main');
this._toolbarEnabled = val;
keyValueStore.set({key: "toolbar-enabled", value: val ? "true" : "false"});
return val;
}
}),
- topicModel: Ember.computed.alias('controllers.topic.model'),
+ topicModel: Ember.computed.alias('topicController.model'),
@computed('model.canEditTitle', 'model.creatingPrivateMessage')
canEditTags(canEditTitle, creatingPrivateMessage) {
@@ -191,7 +197,23 @@ export default Ember.Controller.extend({
return this.get('model.creatingPrivateMessage');
}.property('model.creatingPrivateMessage', 'model.targetUsernames'),
+ @computed('model.topic')
+ draftTitle(topic) {
+ return emojiUnescape(escapeExpression(topic.get('title')));
+ },
+
actions: {
+
+ typed() {
+ this.checkReplyLength();
+ this.get('model').typing();
+ },
+
+ cancelled() {
+ this.send('hitEsc');
+ this.send('hideOptions');
+ },
+
addLinkLookup(linkLookup) {
this.set('linkLookup', linkLookup);
},
@@ -340,6 +362,22 @@ export default Ember.Controller.extend({
});
});
}
+ },
+
+ cannotSeeMention(mentions) {
+ mentions.forEach(mention => {
+ const translation = (this.get('topic.isPrivateMessage')) ?
+ 'composer.cannot_see_mention.private' :
+ 'composer.cannot_see_mention.category';
+ const body = I18n.t(translation, {
+ username: "@" + mention.name
+ });
+ this.appEvents.trigger('composer-messages:create', {
+ extraClass: 'custom-body',
+ templateName: 'custom-body',
+ body
+ });
+ });
}
},
@@ -350,19 +388,14 @@ export default Ember.Controller.extend({
toggle() {
this.closeAutocomplete();
- switch (this.get('model.composeState')) {
- case Composer.OPEN:
- if (Ember.isEmpty(this.get('model.reply')) && Ember.isEmpty(this.get('model.title'))) {
- this.close();
- } else {
- this.shrink();
- }
- break;
- case Composer.DRAFT:
- this.set('model.composeState', Composer.OPEN);
- break;
- case Composer.SAVING:
+ if (this.get('model.composeState') === Composer.OPEN) {
+ if (Ember.isEmpty(this.get('model.reply')) && Ember.isEmpty(this.get('model.title'))) {
this.close();
+ } else {
+ this.shrink();
+ }
+ } else {
+ this.close();
}
return false;
},
@@ -371,7 +404,6 @@ export default Ember.Controller.extend({
save(force) {
const composer = this.get('model');
- const self = this;
// Clear the warning state if we're not showing the checkbox anymore
if (!this.get('showWarning')) {
@@ -402,22 +434,20 @@ export default Ember.Controller.extend({
if (currentTopic) {
buttons.push({
- "label": I18n.t("composer.reply_here") + "
" + escapeExpression(currentTopic.get('title')) + "",
+ "label": I18n.t("composer.reply_here") + "
" + currentTopic.get('fancyTitle') + "",
"class": "btn btn-reply-here",
- "callback": function() {
+ callback: () => {
composer.set('topic', currentTopic);
composer.set('post', null);
- self.save(true);
+ this.save(true);
}
});
}
buttons.push({
- "label": I18n.t("composer.reply_original") + "
" + escapeExpression(this.get('model.topic.title')) + "",
+ "label": I18n.t("composer.reply_original") + "
" + this.get('model.topic.fancyTitle') + "",
"class": "btn-primary btn-reply-on-original",
- "callback": function() {
- self.save(true);
- }
+ callback: () => this.save(true)
});
bootbox.dialog(message, buttons, { "classes": "reply-where-modal" });
@@ -438,29 +468,32 @@ export default Ember.Controller.extend({
}
});
- const promise = composer.save({ imageSizes, editReason: this.get("editReason")}).then(function(result) {
+ const promise = composer.save({ imageSizes, editReason: this.get("editReason")}).then(result=> {
if (result.responseJson.action === "enqueued") {
- self.send('postWasEnqueued', result.responseJson);
- self.destroyDraft();
- self.close();
- self.appEvents.trigger('post-stream:refresh');
+ this.send('postWasEnqueued', result.responseJson);
+ this.destroyDraft();
+ this.close();
+ this.appEvents.trigger('post-stream:refresh');
return result;
}
// If user "created a new topic/post" or "replied as a new topic" successfully, remove the draft.
- if (result.responseJson.action === "create_post" || self.get('replyAsNewTopicDraft')) {
- self.destroyDraft();
+ if (result.responseJson.action === "create_post" || this.get('replyAsNewTopicDraft')) {
+ this.destroyDraft();
}
- if (self.get('model.action') === 'edit') {
- self.appEvents.trigger('post-stream:refresh', { id: parseInt(result.responseJson.id) });
+ if (this.get('model.action') === 'edit') {
+ this.appEvents.trigger('post-stream:refresh', { id: parseInt(result.responseJson.id) });
+ if (result.responseJson.post.post_number === 1) {
+ this.appEvents.trigger('header:show-topic', composer.get('topic'));
+ }
} else {
- self.appEvents.trigger('post-stream:refresh');
+ this.appEvents.trigger('post-stream:refresh');
}
if (result.responseJson.action === "create_post") {
- self.appEvents.trigger('post:highlight', result.payload.post_number);
+ this.appEvents.trigger('post:highlight', result.payload.post_number);
}
- self.close();
+ this.close();
const currentUser = Discourse.User.current();
if (composer.get('creatingTopic')) {
@@ -477,12 +510,12 @@ export default Ember.Controller.extend({
}
}
- }).catch(function(error) {
+ }).catch(error => {
composer.set('disableDrafts', false);
- self.appEvents.one('composer:will-open', () => bootbox.alert(error));
+ this.appEvents.one('composer:will-open', () => bootbox.alert(error));
});
- if (this.get('controllers.application.currentRouteName').split('.')[0] === 'topic' &&
+ if (this.get('application.currentRouteName').split('.')[0] === 'topic' &&
composer.get('topic.id') === this.get('topicModel.id')) {
staged = composer.get('stagedPost');
}
@@ -614,10 +647,10 @@ export default Ember.Controller.extend({
let category;
if (!splitCategory[1]) {
- category = this.site.get('categories').findProperty('nameLower', splitCategory[0].toLowerCase());
+ category = this.site.get('categories').findBy('nameLower', splitCategory[0].toLowerCase());
} else {
const categories = Discourse.Category.list();
- const mainCategory = categories.findProperty('nameLower', splitCategory[0].toLowerCase());
+ const mainCategory = categories.findBy('nameLower', splitCategory[0].toLowerCase());
category = categories.find(function(item) {
return item && item.get('nameLower') === splitCategory[1].toLowerCase() && item.get('parent_category_id') === mainCategory.id;
});
diff --git a/app/assets/javascripts/discourse/controllers/create-account.js.es6 b/app/assets/javascripts/discourse/controllers/create-account.js.es6
index 9bed6142a42..50bd0188021 100644
--- a/app/assets/javascripts/discourse/controllers/create-account.js.es6
+++ b/app/assets/javascripts/discourse/controllers/create-account.js.es6
@@ -7,7 +7,7 @@ import { emailValid } from 'discourse/lib/utilities';
import InputValidation from 'discourse/models/input-validation';
export default Ember.Controller.extend(ModalFunctionality, {
- needs: ['login'],
+ login: Ember.inject.controller(),
uniqueUsernameValidation: null,
globalNicknameExists: false,
@@ -56,7 +56,7 @@ export default Ember.Controller.extend(ModalFunctionality, {
// Validate required fields
let userFields = this.get('userFields');
- if (userFields) { userFields = userFields.filterProperty('field.required'); }
+ if (userFields) { userFields = userFields.filterBy('field.required'); }
if (!Ember.isEmpty(userFields)) {
const anyEmpty = userFields.any(function(uf) {
const val = uf.get('value');
@@ -78,6 +78,13 @@ export default Ember.Controller.extend(ModalFunctionality, {
return Ember.isEmpty(this.get('authOptions.auth_provider'));
}.property('authOptions.auth_provider'),
+ disclaimerHtml: function() {
+ return I18n.t('create_account.disclaimer', {
+ tos_link: this.get('siteSettings.tos_url') || Discourse.getURL('/tos'),
+ privacy_link: this.get('siteSettings.privacy_policy_url') || Discourse.getURL('/privacy')
+ });
+ }.property(),
+
passwordInstructions: function() {
return this.get('isDeveloper') ? I18n.t('user.password.instructions', {count: Discourse.SiteSettings.min_admin_password_length}) : I18n.t('user.password.instructions', {count: Discourse.SiteSettings.min_password_length});
}.property('isDeveloper'),
@@ -107,7 +114,7 @@ export default Ember.Controller.extend(ModalFunctionality, {
email = this.get("accountEmail");
- if (this.get('rejectedEmails').contains(email)) {
+ if (this.get('rejectedEmails').includes(email)) {
return InputValidation.create({
failed: true,
reason: I18n.t('user.email.invalid')
@@ -307,7 +314,7 @@ export default Ember.Controller.extend(ModalFunctionality, {
});
}
- if (this.get('rejectedPasswords').contains(password)) {
+ if (this.get('rejectedPasswords').includes(password)) {
return InputValidation.create({
failed: true,
reason: I18n.t('user.password.common')
@@ -345,7 +352,7 @@ export default Ember.Controller.extend(ModalFunctionality, {
actions: {
externalLogin(provider) {
- this.get('controllers.login').send('externalLogin', provider);
+ this.get('login').send('externalLogin', provider);
},
createAccount() {
diff --git a/app/assets/javascripts/discourse/controllers/discovery-sortable.js.es6 b/app/assets/javascripts/discourse/controllers/discovery-sortable.js.es6
index 5ac8d4b7339..276231067c3 100644
--- a/app/assets/javascripts/discourse/controllers/discovery-sortable.js.es6
+++ b/app/assets/javascripts/discourse/controllers/discovery-sortable.js.es6
@@ -1,21 +1,22 @@
// Just add query params here to have them automatically passed to topic list filters.
-export var queryParams = {
+export const queryParams = {
order: { replace: true, refreshModel: true },
ascending: { replace: true, refreshModel: true },
status: { replace: true, refreshModel: true },
state: { replace: true, refreshModel: true },
search: { replace: true, refreshModel: true },
max_posts: { replace: true, refreshModel: true },
- q: { replace: true, refreshModel: true }
+ q: { replace: true, refreshModel: true },
+ tags: { replace: true }
};
// Basic controller options
-var controllerOpts = {
- needs: ['discovery/topics'],
+const controllerOpts = {
+ discoveryTopics: Ember.inject.controller('discovery/topics'),
queryParams: Object.keys(queryParams),
};
// Aliases for the values
-controllerOpts.queryParams.forEach(p => controllerOpts[p] = Em.computed.alias(`controllers.discovery/topics.${p}`));
+controllerOpts.queryParams.forEach(p => controllerOpts[p] = Ember.computed.alias(`discoveryTopics.${p}`));
export default Ember.Controller.extend(controllerOpts);
diff --git a/app/assets/javascripts/discourse/controllers/discovery.js.es6 b/app/assets/javascripts/discourse/controllers/discovery.js.es6
index 2be7bfd2066..79128e82ad7 100644
--- a/app/assets/javascripts/discourse/controllers/discovery.js.es6
+++ b/app/assets/javascripts/discourse/controllers/discovery.js.es6
@@ -1,16 +1,19 @@
import DiscourseURL from 'discourse/lib/url';
export default Ember.Controller.extend({
- needs: ['navigation/category', 'discovery/topics', 'application'],
+ discoveryTopics: Ember.inject.controller('discovery/topics'),
+ navigationCategory: Ember.inject.controller('navigation/category'),
+ application: Ember.inject.controller(),
+
loading: false,
- category: Em.computed.alias('controllers.navigation/category.category'),
- noSubcategories: Em.computed.alias('controllers.navigation/category.noSubcategories'),
+ category: Em.computed.alias('navigationCategory.category'),
+ noSubcategories: Em.computed.alias('navigationCategory.noSubcategories'),
- loadedAllItems: Em.computed.not("controllers.discovery/topics.model.canLoadMore"),
+ loadedAllItems: Em.computed.not("discoveryTopics.model.canLoadMore"),
_showFooter: function() {
- this.set("controllers.application.showFooter", this.get("loadedAllItems"));
+ this.set("application.showFooter", this.get("loadedAllItems"));
}.observes("loadedAllItems"),
showMoreUrl(period) {
diff --git a/app/assets/javascripts/discourse/controllers/discovery/categories.js.es6 b/app/assets/javascripts/discourse/controllers/discovery/categories.js.es6
index 83b493076ff..19d6ae6b800 100644
--- a/app/assets/javascripts/discourse/controllers/discovery/categories.js.es6
+++ b/app/assets/javascripts/discourse/controllers/discovery/categories.js.es6
@@ -1,44 +1,29 @@
+import computed from 'ember-addons/ember-computed-decorators';
import DiscoveryController from 'discourse/controllers/discovery';
export default DiscoveryController.extend({
- needs: ['modal', 'discovery'],
-
- withLogo: Em.computed.filterBy('model.categories', 'logo_url'),
- showPostsColumn: Em.computed.empty('withLogo'),
+ discovery: Ember.inject.controller(),
// this makes sure the composer isn't scoping to a specific category
category: null,
- actions: {
-
- refresh() {
- // Don't refresh if we're still loading
- if (this.get('controllers.discovery.loading')) { return; }
-
- // If we `send('loading')` here, due to returning true it bubbles up to the
- // router and ember throws an error due to missing `handlerInfos`.
- // Lesson learned: Don't call `loading` yourself.
- this.set('controllers.discovery.loading', true);
-
- const CategoryList = require('discourse/models/category-list').default;
- const parentCategory = this.get('model.parentCategory');
- const promise = parentCategory ? CategoryList.listForParent(this.store, parentCategory) :
- CategoryList.list(this.store);
-
- const self = this;
- promise.then(function(list) {
- self.set('model', list);
- self.send('loadingComplete');
- });
- }
+ @computed
+ canEdit() {
+ return Discourse.User.currentProp('staff');
},
- canEdit: function() {
- return Discourse.User.currentProp('staff');
- }.property(),
+ @computed("model.categories.[].featuredTopics.length")
+ latestTopicOnly() {
+ return this.get("model.categories").find(c => c.get("featuredTopics.length") > 1) === undefined;
+ },
- latestTopicOnly: function() {
- return this.get('model.categories').find(c => c.get('featuredTopics.length') > 1) === undefined;
- }.property('model.categories.@each.featuredTopics.length')
+ @computed("model.parentCategory")
+ categoryPageStyle(parentCategory) {
+ const style = this.siteSettings.desktop_category_page_style;
+ const componentName = (parentCategory && style === "categories_and_latest_topics") ?
+ "categories_only" :
+ style;
+ return Ember.String.dasherize(componentName);
+ }
});
diff --git a/app/assets/javascripts/discourse/controllers/discovery/topics.js.es6 b/app/assets/javascripts/discourse/controllers/discovery/topics.js.es6
index 008ab29a3b0..4c92f6da87f 100644
--- a/app/assets/javascripts/discourse/controllers/discovery/topics.js.es6
+++ b/app/assets/javascripts/discourse/controllers/discovery/topics.js.es6
@@ -5,13 +5,14 @@ import { endWith } from 'discourse/lib/computed';
import showModal from 'discourse/lib/show-modal';
const controllerOpts = {
- needs: ['discovery'],
+ discovery: Ember.inject.controller(),
+ discoveryTopics: Ember.inject.controller('discovery/topics'),
+
period: null,
- canStar: Em.computed.alias('controllers.discovery/topics.currentUser.id'),
- showTopicPostBadges: Em.computed.not('controllers.discovery/topics.new'),
-
- redirectedReason: Em.computed.alias('currentUser.redirected_to_top.reason'),
+ canStar: Ember.computed.alias('currentUser.id'),
+ showTopicPostBadges: Ember.computed.not('discoveryTopics.new'),
+ redirectedReason: Ember.computed.alias('currentUser.redirected_to_top.reason'),
order: 'default',
ascending: false,
@@ -46,12 +47,12 @@ const controllerOpts = {
this.setProperties({ order: "default", ascending: false });
// Don't refresh if we're still loading
- if (this.get('controllers.discovery.loading')) { return; }
+ if (this.get('discovery.loading')) { return; }
// If we `send('loading')` here, due to returning true it bubbles up to the
// router and ember throws an error due to missing `handlerInfos`.
// Lesson learned: Don't call `loading` yourself.
- this.set('controllers.discovery.loading', true);
+ this.set('discovery.loading', true);
this.store.findFiltered('topicList', {filter}).then(list => {
const TopicList = require('discourse/models/topic-list').default;
diff --git a/app/assets/javascripts/discourse/controllers/edit-category.js.es6 b/app/assets/javascripts/discourse/controllers/edit-category.js.es6
index d77783bc0a3..cdc773d592b 100644
--- a/app/assets/javascripts/discourse/controllers/edit-category.js.es6
+++ b/app/assets/javascripts/discourse/controllers/edit-category.js.es6
@@ -20,9 +20,9 @@ export default Ember.Controller.extend(ModalFunctionality, {
changeSize: function() {
if (!Ember.isEmpty(this.get('model.description'))) {
- this.set('controllers.modal.modalClass', 'edit-category-modal full');
+ this.set('modal.modalClass', 'edit-category-modal full');
} else {
- this.set('controllers.modal.modalClass', 'edit-category-modal small');
+ this.set('modal.modalClass', 'edit-category-modal small');
}
}.observes('model.description'),
@@ -34,7 +34,7 @@ export default Ember.Controller.extend(ModalFunctionality, {
}.property('model.id', 'model.name'),
titleChanged: function() {
- this.set('controllers.modal.title', this.get('title'));
+ this.set('modal.title', this.get('title'));
}.observes('title'),
disabled: function() {
diff --git a/app/assets/javascripts/discourse/controllers/edit-topic-auto-close.js.es6 b/app/assets/javascripts/discourse/controllers/edit-topic-auto-close.js.es6
index f0f4301f345..81aa4f5b06a 100644
--- a/app/assets/javascripts/discourse/controllers/edit-topic-auto-close.js.es6
+++ b/app/assets/javascripts/discourse/controllers/edit-topic-auto-close.js.es6
@@ -69,8 +69,10 @@ export default Ember.Controller.extend(ModalFunctionality, {
willCloseI18n: function() {
if (this.get('model.details.auto_close_based_on_last_post')) {
- return I18n.t('topic.auto_close_immediate', {hours: this.get('model.auto_close_time')});
+ let closeDate = new Date(this.get('model.last_posted_at'));
+ let diff = Math.round((new Date() - closeDate)/(1000*60*60));
+ return I18n.t('topic.auto_close_immediate', {count: diff});
}
- }.property('model.details.auto_close_based_on_last_post', 'model.auto_close_time')
+ }.property('model.details.auto_close_based_on_last_post', 'model.last_posted_at')
});
diff --git a/app/assets/javascripts/discourse/controllers/feature-topic.js.es6 b/app/assets/javascripts/discourse/controllers/feature-topic.js.es6
index bb195b636b4..997f2a08889 100644
--- a/app/assets/javascripts/discourse/controllers/feature-topic.js.es6
+++ b/app/assets/javascripts/discourse/controllers/feature-topic.js.es6
@@ -5,7 +5,7 @@ import computed from 'ember-addons/ember-computed-decorators';
import InputValidation from 'discourse/models/input-validation';
export default Ember.Controller.extend(ModalFunctionality, {
- needs: ["topic"],
+ topicController: Ember.inject.controller('topic'),
loading: true,
pinnedInCategoryCount: 0,
@@ -106,7 +106,7 @@ export default Ember.Controller.extend(ModalFunctionality, {
},
_forwardAction(name) {
- this.get("controllers.topic").send(name);
+ this.get("topicController").send(name);
this.send("closeModal");
},
diff --git a/app/assets/javascripts/discourse/controllers/flag.js.es6 b/app/assets/javascripts/discourse/controllers/flag.js.es6
index a5119b383e0..b316091285c 100644
--- a/app/assets/javascripts/discourse/controllers/flag.js.es6
+++ b/app/assets/javascripts/discourse/controllers/flag.js.es6
@@ -1,6 +1,7 @@
import ModalFunctionality from 'discourse/mixins/modal-functionality';
import ActionSummary from 'discourse/models/action-summary';
import { MAX_MESSAGE_LENGTH } from 'discourse/models/post-action-type';
+import computed from 'ember-addons/ember-computed-decorators';
export default Ember.Controller.extend(ModalFunctionality, {
userDetails: null,
@@ -14,13 +15,18 @@ export default Ember.Controller.extend(ModalFunctionality, {
this.set('selected', null);
},
+ @computed('flagTopic')
+ title(flagTopic) {
+ return flagTopic ? 'flagging_topic.title' : 'flagging.title';
+ },
+
flagsAvailable: function() {
if (!this.get('flagTopic')) {
// flagging post
let flagsAvailable = this.get('model.flagsAvailable');
// "message user" option should be at the top
- const notifyUserIndex = flagsAvailable.indexOf(flagsAvailable.filterProperty('name_key', 'notify_user')[0]);
+ const notifyUserIndex = flagsAvailable.indexOf(flagsAvailable.filterBy('name_key', 'notify_user')[0]);
if (notifyUserIndex !== -1) {
const notifyUser = flagsAvailable[notifyUserIndex];
flagsAvailable.splice(notifyUserIndex, 1);
@@ -93,7 +99,7 @@ export default Ember.Controller.extend(ModalFunctionality, {
let postAction; // an instance of ActionSummary
if (!this.get('flagTopic')) {
- postAction = this.get('model.actions_summary').findProperty('id', this.get('selected.id'));
+ postAction = this.get('model.actions_summary').findBy('id', this.get('selected.id'));
} else {
postAction = this.get('topicActionByName.' + this.get('selected.name_key'));
}
diff --git a/app/assets/javascripts/discourse/controllers/forgot-password.js.es6 b/app/assets/javascripts/discourse/controllers/forgot-password.js.es6
index fd98f7910f1..fb159186400 100644
--- a/app/assets/javascripts/discourse/controllers/forgot-password.js.es6
+++ b/app/assets/javascripts/discourse/controllers/forgot-password.js.es6
@@ -1,62 +1,54 @@
import { ajax } from 'discourse/lib/ajax';
import ModalFunctionality from 'discourse/mixins/modal-functionality';
import { escapeExpression } from 'discourse/lib/utilities';
+import { extractError } from 'discourse/lib/ajax-error';
+import computed from 'ember-addons/ember-computed-decorators';
export default Ember.Controller.extend(ModalFunctionality, {
- // You need a value in the field to submit it.
- submitDisabled: function() {
- return Ember.isEmpty((this.get('accountEmailOrUsername') || '').trim()) || this.get('disabled');
- }.property('accountEmailOrUsername', 'disabled'),
+ @computed('accountEmailOrUsername', 'disabled')
+ submitDisabled(accountEmailOrUsername, disabled) {
+ return Ember.isEmpty((accountEmailOrUsername || '').trim()) || disabled;
+ },
- onShow: function() {
+ onShow() {
if ($.cookie('email')) {
this.set('accountEmailOrUsername', $.cookie('email'));
}
},
actions: {
- submit: function() {
- var self = this;
-
+ submit() {
if (this.get('submitDisabled')) return false;
this.set('disabled', true);
- var success = function(data) {
- // don't tell people what happened, this keeps it more secure (ensure same on server)
- var escaped = escapeExpression(self.get('accountEmailOrUsername'));
- var isEmail = self.get('accountEmailOrUsername').match(/@/);
-
- var key = 'forgot_password.complete_' + (isEmail ? 'email' : 'username');
- var extraClass;
+ ajax('/session/forgot_password', {
+ data: { login: this.get('accountEmailOrUsername').trim() },
+ type: 'POST'
+ }).then(data => {
+ const escaped = escapeExpression(this.get('accountEmailOrUsername'));
+ const isEmail = this.get('accountEmailOrUsername').match(/@/);
+ let key = 'forgot_password.complete_' + (isEmail ? 'email' : 'username');
+ let extraClass;
if (data.user_found === true) {
key += '_found';
- self.set('accountEmailOrUsername', '');
+ this.set('accountEmailOrUsername', '');
bootbox.alert(I18n.t(key, {email: escaped, username: escaped}));
- self.send("closeModal");
+ this.send("closeModal");
} else {
if (data.user_found === false) {
key += '_not_found';
extraClass = 'error';
}
- self.flash(I18n.t(key, {email: escaped, username: escaped}), extraClass);
+ this.flash(I18n.t(key, {email: escaped, username: escaped}), extraClass);
}
- };
-
- var fail = function(e) {
- self.flash(e.responseJSON.errors[0], 'error');
- };
-
- ajax('/session/forgot_password', {
- data: { login: this.get('accountEmailOrUsername').trim() },
- type: 'POST'
- }).then(success, fail).finally(function(){
- setTimeout(function(){
- self.set('disabled',false);
- }, 1000);
+ }).catch(e => {
+ this.flash(extractError(e), 'error');
+ }).finally(() => {
+ setTimeout(() => this.set('disabled', false), 1000);
});
return false;
diff --git a/app/assets/javascripts/discourse/controllers/full-page-search.js.es6 b/app/assets/javascripts/discourse/controllers/full-page-search.js.es6
index 27ee3f0309b..91e5b907d2c 100644
--- a/app/assets/javascripts/discourse/controllers/full-page-search.js.es6
+++ b/app/assets/javascripts/discourse/controllers/full-page-search.js.es6
@@ -1,9 +1,10 @@
import { ajax } from 'discourse/lib/ajax';
import { translateResults, searchContextDescription, getSearchKey, isValidSearchTerm } from "discourse/lib/search";
-import showModal from 'discourse/lib/show-modal';
import { default as computed, observes } from 'ember-addons/ember-computed-decorators';
import Category from 'discourse/models/category';
import { escapeExpression } from 'discourse/lib/utilities';
+import { setTransient } from 'discourse/lib/page-tracker';
+import { iconHTML } from 'discourse-common/helpers/fa-icon';
const SortOrders = [
{name: I18n.t('search.relevance'), id: 0},
@@ -13,23 +14,31 @@ const SortOrders = [
];
export default Ember.Controller.extend({
- needs: ["application"],
+ application: Ember.inject.controller(),
+ bulkSelectEnabled: null,
loading: Em.computed.not("model"),
- queryParams: ["q", "context_id", "context", "skip_context"],
+ queryParams: ["q", "expanded", "context_id", "context", "skip_context"],
q: null,
selected: [],
+ expanded: false,
context_id: null,
context: null,
searching: false,
sortOrder: 0,
sortOrders: SortOrders,
+ invalidSearch: false,
@computed('model.posts')
- resultCount(posts){
+ resultCount(posts) {
return posts && posts.length;
},
+ @computed('resultCount')
+ hasResults(resultCount) {
+ return (resultCount || 0) > 0;
+ },
+
@computed('q')
hasAutofocus(q) {
return Em.isEmpty(q);
@@ -62,11 +71,6 @@ export default Ember.Controller.extend({
return isValidSearchTerm(q);
},
- @computed('searchTerm', 'searching')
- searchButtonDisabled(searchTerm, searching) {
- return !!(searching || !isValidSearchTerm(searchTerm));
- },
-
@computed('q')
noSortQ(q) {
if (q) {
@@ -85,7 +89,7 @@ export default Ember.Controller.extend({
setSearchTerm(term) {
this._searchOnSortChange = false;
if (term) {
- SortOrders.forEach((order) => {
+ SortOrders.forEach(order => {
if (term.indexOf(order.term) > -1){
this.set('sortOrder', order.id);
term = term.replace(order.term, "");
@@ -98,9 +102,9 @@ export default Ember.Controller.extend({
},
@observes('sortOrder')
- triggerSearch(){
+ triggerSearch() {
if (this._searchOnSortChange) {
- this.search();
+ this._search();
}
},
@@ -127,18 +131,39 @@ export default Ember.Controller.extend({
@observes('loading')
_showFooter() {
- this.set("controllers.application.showFooter", !this.get("loading"));
+ this.set("application.showFooter", !this.get("loading"));
},
- canBulkSelect: Em.computed.alias('currentUser.staff'),
+ @computed('hasResults')
+ canBulkSelect(hasResults) {
+ return this.currentUser && this.currentUser.staff && hasResults;
+ },
+
+ @computed('expanded')
+ canCreateTopic(expanded) {
+ return this.currentUser && !this.site.mobileView && !expanded;
+ },
+
+ @computed('expanded')
+ searchAdvancedIcon(expanded) {
+ return iconHTML(expanded ? "caret-down" : "caret-right");
+ },
+
+ _search() {
+ if (this.get("searching")) { return; }
+
+ this.set('invalidSearch', false);
+ const searchTerm = this.get('searchTerm');
+ if (!isValidSearchTerm(searchTerm)) {
+ this.set('invalidSearch', true);
+ return;
+ }
- search(){
- if (this.get("searching")) return;
this.set("searching", true);
+ this.set('bulkSelectEnabled', false);
+ this.get('selected').clear();
- const router = Discourse.__container__.lookup('router:main');
-
- var args = { q: this.get("searchTerm") };
+ var args = { q: searchTerm };
const sortOrder = this.get("sortOrder");
if (sortOrder && SortOrders[sortOrder].term) {
@@ -160,9 +185,9 @@ export default Ember.Controller.extend({
ajax("/search", { data: args }).then(results => {
const model = translateResults(results) || {};
- router.transientCache('lastSearch', { searchKey, model }, 5);
+ setTransient('lastSearch', { searchKey, model }, 5);
this.set("model", model);
- }).finally(() => { this.set("searching",false); });
+ }).finally(() => this.set("searching", false));
},
actions: {
@@ -187,22 +212,12 @@ export default Ember.Controller.extend({
this.get('selected').clear();
},
- refresh() {
- this.set('bulkSelectEnabled', false);
- this.get('selected').clear();
- this.search();
- },
-
- showSearchHelp() {
- // TODO: dupe code should be centralized
- ajax("/static/search_help.html", { dataType: 'html' }).then((model) => {
- showModal('searchHelp', { model });
- });
- },
-
search() {
- if (this.get("searchButtonDisabled")) return;
- this.search();
+ this._search();
+ },
+
+ toggleAdvancedSearch() {
+ this.toggleProperty('expanded');
}
}
});
diff --git a/app/assets/javascripts/discourse/controllers/group-posts.js.es6 b/app/assets/javascripts/discourse/controllers/group-activity-posts.js.es6
similarity index 82%
rename from app/assets/javascripts/discourse/controllers/group-posts.js.es6
rename to app/assets/javascripts/discourse/controllers/group-activity-posts.js.es6
index c9e791c1f1b..c2434c83c61 100644
--- a/app/assets/javascripts/discourse/controllers/group-posts.js.es6
+++ b/app/assets/javascripts/discourse/controllers/group-activity-posts.js.es6
@@ -1,19 +1,18 @@
import { fmt } from 'discourse/lib/computed';
-export default Ember.ArrayController.extend({
- needs: ['group'],
+export default Ember.Controller.extend({
+ group: Ember.inject.controller(),
loading: false,
emptyText: fmt('type', 'groups.empty.%@'),
actions: {
loadMore() {
-
if (this.get('loading')) { return; }
this.set('loading', true);
const posts = this.get('model');
if (posts && posts.length) {
const beforePostId = posts[posts.length-1].get('id');
- const group = this.get('controllers.group.model');
+ const group = this.get('group.model');
const opts = { beforePostId, type: this.get('type') };
group.findPosts(opts).then(newPosts => {
diff --git a/app/assets/javascripts/discourse/controllers/group-activity.js.es6 b/app/assets/javascripts/discourse/controllers/group-activity.js.es6
new file mode 100644
index 00000000000..955822ffcf5
--- /dev/null
+++ b/app/assets/javascripts/discourse/controllers/group-activity.js.es6
@@ -0,0 +1,10 @@
+import computed from 'ember-addons/ember-computed-decorators';
+
+export default Ember.Controller.extend({
+ application: Ember.inject.controller(),
+
+ @computed('model.is_group_user')
+ showGroupMessages(isGroupUser) {
+ return isGroupUser || (this.currentUser && this.currentUser.admin);
+ }
+});
diff --git a/app/assets/javascripts/discourse/controllers/group-edit.js.es6 b/app/assets/javascripts/discourse/controllers/group-edit.js.es6
new file mode 100644
index 00000000000..32277430af5
--- /dev/null
+++ b/app/assets/javascripts/discourse/controllers/group-edit.js.es6
@@ -0,0 +1,23 @@
+import { popupAjaxError } from 'discourse/lib/ajax-error';
+import computed from 'ember-addons/ember-computed-decorators';
+
+export default Ember.Controller.extend({
+ @computed('saving')
+ savingText(saving) {
+ if (saving !== undefined) {
+ return saving ? I18n.t('saving') : I18n.t('saved');
+ }
+ },
+
+ actions: {
+ save() {
+ this.set('saving', true);
+
+ this.get('model').save().catch(error => {
+ popupAjaxError(error);
+ }).finally(() => {
+ this.set('saving', false);
+ });
+ }
+ }
+});
diff --git a/app/assets/javascripts/discourse/controllers/group-index.js.es6 b/app/assets/javascripts/discourse/controllers/group-index.js.es6
index 306ff8aa80b..269ecab7cdb 100644
--- a/app/assets/javascripts/discourse/controllers/group-index.js.es6
+++ b/app/assets/javascripts/discourse/controllers/group-index.js.es6
@@ -1,24 +1,37 @@
import { popupAjaxError } from 'discourse/lib/ajax-error';
-import computed from 'ember-addons/ember-computed-decorators';
import Group from 'discourse/models/group';
+import { default as computed, observes } from 'ember-addons/ember-computed-decorators';
export default Ember.Controller.extend({
+ queryParams: ['order', 'desc'],
+ order: '',
+ desc: null,
loading: false,
limit: null,
offset: null,
+ isOwner: Ember.computed.alias('model.is_group_owner'),
+ showActions: false,
- @computed('model.owners.[]')
- isOwner(owners) {
- if (this.get('currentUser.admin')) {
- return true;
- }
- const currentUserId = this.get('currentUser.id');
- if (currentUserId) {
- return !!owners.findBy('id', currentUserId);
- }
+ @observes('order', 'desc')
+ refreshMembers() {
+ this.set('loading', true);
+
+ this.get('model') &&
+ this.get('model')
+ .findMembers({ order: this.get('order'), desc: this.get('desc') })
+ .finally(() => this.set('loading', false));
+ },
+
+ @computed('model.members')
+ hasMembers(members) {
+ return members && members.length > 0;
},
actions: {
+ toggleActions() {
+ this.toggleProperty("showActions");
+ },
+
removeMember(user) {
this.get('model').removeMember(user);
},
@@ -36,7 +49,12 @@ export default Ember.Controller.extend({
this.set("loading", true);
- Group.loadMembers(this.get("model.name"), this.get("model.members.length"), this.get("limit")).then(result => {
+ Group.loadMembers(
+ this.get("model.name"),
+ this.get("model.members.length"),
+ this.get("limit"),
+ { order: this.get('order'), desc: this.get('desc') }
+ ).then(result => {
this.get("model.members").addObjects(result.members.map(member => Discourse.User.create(member)));
this.setProperties({
loading: false,
diff --git a/app/assets/javascripts/discourse/controllers/group-logs.js.es6 b/app/assets/javascripts/discourse/controllers/group-logs.js.es6
new file mode 100644
index 00000000000..0019127c3a6
--- /dev/null
+++ b/app/assets/javascripts/discourse/controllers/group-logs.js.es6
@@ -0,0 +1,57 @@
+import { default as computed, observes } from 'ember-addons/ember-computed-decorators';
+
+export default Ember.Controller.extend({
+ group: Ember.inject.controller(),
+ loading: false,
+ offset: 0,
+
+ init() {
+ this._super();
+ this.set('filters', Ember.Object.create());
+ },
+
+ @computed('filters.action', 'filters.acting_user', 'filters.target_user', 'filters.subject')
+ filterParams(action, acting_user, target_user, subject) {
+ return { action, acting_user, target_user, subject };
+ },
+
+ @observes('filters.action', 'filters.acting_user', 'filters.target_user', 'filters.subject')
+ _refreshModel() {
+ this.get('group.model').findLogs(0, this.get('filterParams')).then(results => {
+ this.set('offset', 0);
+
+ this.get('model').setProperties({
+ logs: results.logs,
+ all_loaded: results.all_loaded
+ });
+ });
+ },
+
+ reset() {
+ this.setProperties({
+ offset: 0,
+ filters: Ember.Object.create()
+ });
+ },
+
+ actions: {
+ loadMore() {
+ if (this.get('model.all_loaded')) return;
+
+ this.set('loading', true);
+
+ this.get('group.model').findLogs(this.get('offset') + 1, this.get('filterParams'))
+ .then(results => {
+ results.logs.forEach(result => this.get('model.logs').addObject(result));
+ this.incrementProperty('offset');
+ this.set('model.all_loaded', results.all_loaded);
+ }).finally(() => {
+ this.set('loading', false);
+ });
+ },
+
+ clearFilter(key) {
+ this.set(`filters.${key}`, '');
+ }
+ }
+});
diff --git a/app/assets/javascripts/discourse/controllers/group.js.es6 b/app/assets/javascripts/discourse/controllers/group.js.es6
index ac16e4342e0..126f8911dc8 100644
--- a/app/assets/javascripts/discourse/controllers/group.js.es6
+++ b/app/assets/javascripts/discourse/controllers/group.js.es6
@@ -6,43 +6,65 @@ var Tab = Em.Object.extend({
return 'group.' + name;
},
- @computed('name')
- message(name) {
- return I18n.t('groups.' + name);
+ @computed('name', 'i18nKey')
+ message(name, i18nKey) {
+ return I18n.t(`groups.${i18nKey || name}`);
}
});
-
export default Ember.Controller.extend({
+ application: Ember.inject.controller(),
counts: null,
showing: 'members',
+
tabs: [
- Tab.create({ name: 'members', active: true, 'location': 'group.index' }),
- Tab.create({ name: 'posts' }),
- Tab.create({ name: 'topics' }),
- Tab.create({ name: 'mentions' }),
- Tab.create({ name: 'messages', requiresMembership: true })
+ Tab.create({ name: 'members', 'location': 'group.index', icon: 'users' }),
+ Tab.create({ name: 'activity' }),
+ Tab.create({
+ name: 'edit', i18nKey: 'edit.title', icon: 'pencil', requiresGroupAdmin: true
+ }),
+ Tab.create({
+ name: 'logs', i18nKey: 'logs.title', icon: 'list-alt', requiresGroupAdmin: true
+ })
],
- @observes('counts')
- countsChanged() {
- const counts = this.get('counts');
- this.get('tabs').forEach(tab => {
- tab.set('count', counts.get(tab.get('name')));
- });
+ @computed('model.is_group_owner', 'model.automatic')
+ canEditGroup(isGroupOwner, automatic) {
+ return !automatic && isGroupOwner;
},
- @observes('showing')
- showingChanged() {
- const showing = this.get('showing');
-
- this.get('tabs').forEach(tab => {
- tab.set('active', showing === tab.get('name'));
- });
+ @computed('model.name', 'model.full_name')
+ groupName(name, fullName) {
+ return (fullName || name).capitalize();
},
- @computed('model.is_member')
- getTabs(isMember) {
- return this.get('tabs').filter(t => isMember || !t.get('requiresMembership'));
+ @computed('model.name', 'model.flair_url', 'model.flair_bg_color', 'model.flair_color')
+ avatarFlairAttributes(groupName, flairURL, flairBgColor, flairColor) {
+ return {
+ primary_group_flair_url: flairURL,
+ primary_group_flair_bg_color: flairBgColor,
+ primary_group_flair_color: flairColor,
+ primary_group_name: groupName
+ };
+ },
+
+ @observes('model.user_count')
+ _setMembersTabCount() {
+ this.get('tabs')[0].set('count', this.get('model.user_count'));
+ },
+
+ @computed('model.is_group_user', 'model.is_group_owner', 'model.automatic')
+ getTabs(isGroupUser, isGroupOwner, automatic) {
+ return this.get('tabs').filter(t => {
+ let display = true;
+
+ if (this.currentUser && t.get('requiresGroupAdmin')) {
+ display = automatic ? false : (this.currentUser.admin || isGroupOwner);
+ } else if (t.get('requiresGroupAdmin')) {
+ display = false;
+ }
+
+ return display;
+ });
}
});
diff --git a/app/assets/javascripts/discourse/controllers/groups.js.es6 b/app/assets/javascripts/discourse/controllers/groups.js.es6
new file mode 100644
index 00000000000..d8ce08f3227
--- /dev/null
+++ b/app/assets/javascripts/discourse/controllers/groups.js.es6
@@ -0,0 +1,16 @@
+import { observes } from 'ember-addons/ember-computed-decorators';
+
+export default Ember.Controller.extend({
+ application: Ember.inject.controller(),
+
+ @observes("groups.canLoadMore")
+ _showFooter() {
+ this.set("application.showFooter", !this.get("groups.canLoadMore"));
+ },
+
+ actions: {
+ loadMore() {
+ this.get('groups').loadMore();
+ }
+ }
+});
diff --git a/app/assets/javascripts/discourse/controllers/header.js.es6 b/app/assets/javascripts/discourse/controllers/header.js.es6
index 2665f2afbd1..f5979bb36a7 100644
--- a/app/assets/javascripts/discourse/controllers/header.js.es6
+++ b/app/assets/javascripts/discourse/controllers/header.js.es6
@@ -1,6 +1,7 @@
import { addFlagProperty as realAddFlagProperty } from 'discourse/components/site-header';
+import deprecated from 'discourse-common/lib/deprecated';
export function addFlagProperty(prop) {
- Ember.warn("importing `addFlagProperty` is deprecated. Use the PluginAPI instead");
+ deprecated("importing `addFlagProperty` is deprecated. Use the PluginAPI instead");
realAddFlagProperty(prop);
}
diff --git a/app/assets/javascripts/discourse/controllers/history.js.es6 b/app/assets/javascripts/discourse/controllers/history.js.es6
index 42550be8803..e94852cf3ec 100644
--- a/app/assets/javascripts/discourse/controllers/history.js.es6
+++ b/app/assets/javascripts/discourse/controllers/history.js.es6
@@ -21,6 +21,9 @@ export default Ember.Controller.extend(ModalFunctionality, {
if (this.site.mobileView) { this.set("viewMode", "inline"); }
}.on("init"),
+ previousFeaturedLink: Em.computed.alias('model.featured_link_changes.previous'),
+ currentFeaturedLink: Em.computed.alias('model.featured_link_changes.current'),
+
previousTagChanges: customTagArray('model.tags_changes.previous'),
currentTagChanges: customTagArray('model.tags_changes.current'),
diff --git a/app/assets/javascripts/discourse/controllers/invite.js.es6 b/app/assets/javascripts/discourse/controllers/invite.js.es6
index cd4c6afec3d..e9293ea8059 100644
--- a/app/assets/javascripts/discourse/controllers/invite.js.es6
+++ b/app/assets/javascripts/discourse/controllers/invite.js.es6
@@ -1,8 +1,9 @@
import ModalFunctionality from 'discourse/mixins/modal-functionality';
import { emailValid } from 'discourse/lib/utilities';
+import computed from 'ember-addons/ember-computed-decorators';
export default Ember.Controller.extend(ModalFunctionality, {
- needs: ['user-invited-show'],
+ userInvitedShow: Ember.inject.controller('user-invited-show'),
// If this isn't defined, it will proxy to the user model on the preferences
// page which is wrong.
@@ -11,6 +12,17 @@ export default Ember.Controller.extend(ModalFunctionality, {
customMessage: null,
inviteIcon: "envelope",
+ @computed('isMessage', 'invitingToTopic')
+ title(isMessage, invitingToTopic) {
+ if (isMessage) {
+ return 'topic.invite_private.title';
+ } else if (invitingToTopic) {
+ return 'topic.invite_reply.title';
+ } else {
+ return 'user.invited.create';
+ }
+ },
+
isAdmin: function(){
return Discourse.User.currentProp("admin");
}.property(),
@@ -120,9 +132,7 @@ export default Ember.Controller.extend(ModalFunctionality, {
},
successMessage: function() {
- if (this.get('model.inviteLink')) {
- return I18n.t('user.invited.generated_link_message', {inviteLink: this.get('model.inviteLink'), invitedEmail: this.get('emailOrUsername')});
- } else if (this.get('hasGroups')) {
+ if (this.get('hasGroups')) {
return I18n.t('topic.invite_private.success_group');
} else if (this.get('isMessage')) {
return I18n.t('topic.invite_private.success');
@@ -169,7 +179,7 @@ export default Ember.Controller.extend(ModalFunctionality, {
if (this.get('disabled')) { return; }
const groupNames = this.get('model.groupNames'),
- userInvitedController = this.get('controllers.user-invited-show'),
+ userInvitedController = this.get('userInvitedShow'),
model = this.get('model');
model.setProperties({ saving: true, error: false });
@@ -215,7 +225,7 @@ export default Ember.Controller.extend(ModalFunctionality, {
if (this.get('disabled')) { return; }
const groupNames = this.get('model.groupNames'),
- userInvitedController = this.get('controllers.user-invited-show'),
+ userInvitedController = this.get('userInvitedShow'),
model = this.get('model');
var topicId = null;
diff --git a/app/assets/javascripts/discourse/controllers/jump-to-post.js.es6 b/app/assets/javascripts/discourse/controllers/jump-to-post.js.es6
new file mode 100644
index 00000000000..94ccc5595a4
--- /dev/null
+++ b/app/assets/javascripts/discourse/controllers/jump-to-post.js.es6
@@ -0,0 +1,18 @@
+import ModalFunctionality from 'discourse/mixins/modal-functionality';
+
+export default Ember.Controller.extend(ModalFunctionality, {
+ model: null,
+ postNumber: null,
+
+ actions: {
+ jump() {
+ let where = parseInt(this.get('postNumber'));
+ if (where < 1) { where = 1; }
+ const max = this.get('topic.postStream.filteredPostsCount');
+ if (where > max) { where = max; }
+
+ this.jumpToIndex(where);
+ this.send('closeModal');
+ }
+ }
+});
diff --git a/app/assets/javascripts/discourse/controllers/keyboard-shortcuts-help.js.es6 b/app/assets/javascripts/discourse/controllers/keyboard-shortcuts-help.js.es6
index 5e0414bcd08..7a50811e572 100644
--- a/app/assets/javascripts/discourse/controllers/keyboard-shortcuts-help.js.es6
+++ b/app/assets/javascripts/discourse/controllers/keyboard-shortcuts-help.js.es6
@@ -1,9 +1,7 @@
import ModalFunctionality from 'discourse/mixins/modal-functionality';
export default Ember.Controller.extend(ModalFunctionality, {
- needs: ['modal'],
-
- onShow: function() {
- this.set('controllers.modal.modalClass', 'keyboard-shortcuts-modal');
+ onShow() {
+ this.set('modal.modalClass', 'keyboard-shortcuts-modal');
}
});
diff --git a/app/assets/javascripts/discourse/controllers/login.js.es6 b/app/assets/javascripts/discourse/controllers/login.js.es6
index 4abefa97b75..5c97bbbf82d 100644
--- a/app/assets/javascripts/discourse/controllers/login.js.es6
+++ b/app/assets/javascripts/discourse/controllers/login.js.es6
@@ -11,13 +11,17 @@ const AuthErrors =
'not_allowed_from_ip_address'];
export default Ember.Controller.extend(ModalFunctionality, {
- needs: ['modal', 'createAccount', 'forgotPassword', 'application'],
+
+ createAccount: Ember.inject.controller(),
+ forgotPassword: Ember.inject.controller(),
+ application: Ember.inject.controller(),
+
authenticate: null,
loggingIn: false,
loggedIn: false,
canLoginLocal: setting('enable_local_logins'),
- loginRequired: Em.computed.alias('controllers.application.loginRequired'),
+ loginRequired: Em.computed.alias('application.loginRequired'),
resetForm: function() {
this.set('authenticate', null);
@@ -37,7 +41,7 @@ export default Ember.Controller.extend(ModalFunctionality, {
loginDisabled: Em.computed.or('loggingIn', 'loggedIn'),
showSignupLink: function() {
- return this.get('controllers.application.canSignUp') &&
+ return this.get('application.canSignUp') &&
!this.get('loggingIn') &&
Ember.isEmpty(this.get('authenticate'));
}.property('loggingIn', 'authenticate'),
@@ -47,8 +51,9 @@ export default Ember.Controller.extend(ModalFunctionality, {
}.property('loggingIn', 'authenticate'),
actions: {
- login: function() {
+ login() {
const self = this;
+ if (this.get('loginDisabled')) { return; }
if(Ember.isEmpty(this.get('loginName')) || Ember.isEmpty(this.get('loginPassword'))){
self.flash(I18n.t('login.blank_username_or_password'), 'error');
@@ -130,8 +135,9 @@ export default Ember.Controller.extend(ModalFunctionality, {
if(customLogin){
customLogin();
} else {
- const authUrl = loginMethod.get('customUrl') || Discourse.getURL("/auth/" + name);
+ let authUrl = loginMethod.get('customUrl') || Discourse.getURL("/auth/" + name);
if (loginMethod.get("fullScreenLogin")) {
+ document.cookie = "fsl=true";
window.location = authUrl;
} else {
this.set('authenticate', name);
@@ -140,6 +146,11 @@ export default Ember.Controller.extend(ModalFunctionality, {
const height = loginMethod.get("frameHeight") || 400;
const width = loginMethod.get("frameWidth") || 800;
+
+ if (loginMethod.get("displayPopup")) {
+ authUrl = authUrl + "?display=popup";
+ }
+
const w = window.open(authUrl, "_blank",
"menubar=no,status=no,height=" + height + ",width=" + width + ",left=" + left + ",top=" + top);
const self = this;
@@ -154,7 +165,7 @@ export default Ember.Controller.extend(ModalFunctionality, {
},
createAccount: function() {
- const createAccountController = this.get('controllers.createAccount');
+ const createAccountController = this.get('createAccount');
if (createAccountController) {
createAccountController.resetForm();
const loginName = this.get('loginName');
@@ -168,7 +179,7 @@ export default Ember.Controller.extend(ModalFunctionality, {
},
forgotPassword: function() {
- const forgotPasswordController = this.get('controllers.forgotPassword');
+ const forgotPasswordController = this.get('forgotPassword');
if (forgotPasswordController) { forgotPasswordController.set("accountEmailOrUsername", this.get("loginName")); }
this.send("showForgotPassword");
}
@@ -176,7 +187,7 @@ export default Ember.Controller.extend(ModalFunctionality, {
authMessage: (function() {
if (Ember.isEmpty(this.get('authenticate'))) return "";
- const method = findAll(this.siteSettings).findProperty("name", this.get("authenticate"));
+ const method = findAll(this.siteSettings, this.capabilities, this.isMobileDevice).findBy("name", this.get("authenticate"));
if(method){
return method.get('message');
}
@@ -223,7 +234,7 @@ export default Ember.Controller.extend(ModalFunctionality, {
return;
}
- const createAccountController = this.get('controllers.createAccount');
+ const createAccountController = this.get('createAccount');
createAccountController.setProperties({
accountEmail: options.email,
accountUsername: options.username,
diff --git a/app/assets/javascripts/discourse/controllers/merge-topic.js.es6 b/app/assets/javascripts/discourse/controllers/merge-topic.js.es6
index 197c9fcb377..34bfa8ba34e 100644
--- a/app/assets/javascripts/discourse/controllers/merge-topic.js.es6
+++ b/app/assets/javascripts/discourse/controllers/merge-topic.js.es6
@@ -5,12 +5,11 @@ import DiscourseURL from 'discourse/lib/url';
// Modal related to merging of topics
export default Ember.Controller.extend(SelectedPostsCount, ModalFunctionality, {
- needs: ['topic'],
+ topicController: Ember.inject.controller('topic'),
saving: false,
selectedTopicId: null,
- topicController: Em.computed.alias('controllers.topic'),
selectedPosts: Em.computed.alias('topicController.selectedPosts'),
selectedReplies: Em.computed.alias('topicController.selectedReplies'),
allPostsSelected: Em.computed.alias('topicController.allPostsSelected'),
@@ -26,7 +25,7 @@ export default Ember.Controller.extend(SelectedPostsCount, ModalFunctionality, {
}.property('saving'),
onShow() {
- this.set('controllers.modal.modalClass', 'split-modal');
+ this.set('modal.modalClass', 'split-modal');
},
actions: {
diff --git a/app/assets/javascripts/discourse/controllers/navigation/default.js.es6 b/app/assets/javascripts/discourse/controllers/navigation/default.js.es6
index 1d23c1fb2b1..93ae014e474 100644
--- a/app/assets/javascripts/discourse/controllers/navigation/default.js.es6
+++ b/app/assets/javascripts/discourse/controllers/navigation/default.js.es6
@@ -1,7 +1,8 @@
import computed from "ember-addons/ember-computed-decorators";
export default Ember.Controller.extend({
- needs: ['discovery', 'discovery/topics'],
+ discovery: Ember.inject.controller(),
+ discoveryTopics: Ember.inject.controller('discovery/topics'),
@computed()
categories() {
diff --git a/app/assets/javascripts/discourse/controllers/preferences.js.es6 b/app/assets/javascripts/discourse/controllers/preferences.js.es6
index 98e0b05f7ce..5ee945d4da2 100644
--- a/app/assets/javascripts/discourse/controllers/preferences.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences.js.es6
@@ -3,6 +3,7 @@ import CanCheckEmails from 'discourse/mixins/can-check-emails';
import { popupAjaxError } from 'discourse/lib/ajax-error';
import computed from "ember-addons/ember-computed-decorators";
import { cook } from 'discourse/lib/text';
+import { NotificationLevels } from 'discourse/lib/notification-levels';
export default Ember.Controller.extend(CanCheckEmails, {
@@ -24,7 +25,7 @@ export default Ember.Controller.extend(CanCheckEmails, {
// Staff can edit fields that are not `editable`
if (!this.get('currentUser.staff')) {
- siteUserFields = siteUserFields.filterProperty('editable', true);
+ siteUserFields = siteUserFields.filterBy('editable', true);
}
return siteUserFields.sortBy('position').map(function(field) {
const value = userFields ? userFields[field.get('id').toString()] : null;
@@ -59,11 +60,6 @@ export default Ember.Controller.extend(CanCheckEmails, {
return !this.siteSettings.enable_sso && this.siteSettings.enable_local_logins;
},
- @computed()
- canReceiveDigest() {
- return !this.siteSettings.disable_digest_emails;
- },
-
@computed()
availableLocales() {
return this.siteSettings.available_locales.split('|').map(s => ({ name: s, value: s }));
@@ -83,7 +79,8 @@ export default Ember.Controller.extend(CanCheckEmails, {
mailingListModeOptions() {
return [
{name: I18n.t('user.mailing_list_mode.daily'), value: 0},
- {name: this.get('frequencyEstimate'), value: 1}
+ {name: this.get('frequencyEstimate'), value: 1},
+ {name: I18n.t('user.mailing_list_mode.individual_no_echo'), value: 2}
];
},
@@ -115,6 +112,10 @@ export default Ember.Controller.extend(CanCheckEmails, {
{ name: I18n.t('user.auto_track_options.after_5_minutes'), value: 300000 },
{ name: I18n.t('user.auto_track_options.after_10_minutes'), value: 600000 }],
+ notificationLevelsForReplying: [{ name: I18n.t('topic.notifications.watching.title'), value: NotificationLevels.WATCHING },
+ { name: I18n.t('topic.notifications.tracking.title'), value: NotificationLevels.TRACKING }],
+
+
considerNewTopicOptions: [{ name: I18n.t('user.new_topic_duration.not_viewed'), value: -1 },
{ name: I18n.t('user.new_topic_duration.after_1_day'), value: 60 * 24 },
{ name: I18n.t('user.new_topic_duration.after_2_days'), value: 60 * 48 },
@@ -156,9 +157,7 @@ export default Ember.Controller.extend(CanCheckEmails, {
// Cook the bio for preview
model.set('name', this.get('newNameInput'));
- var options = {};
-
- return model.save(options).then(() => {
+ return model.save().then(() => {
if (Discourse.User.currentProp('id') === model.get('id')) {
Discourse.User.currentProp('name', model.get('name'));
}
diff --git a/app/assets/javascripts/discourse/controllers/preferences/badge-title.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/badge-title.js.es6
index b71660d17fa..f2c543e6be6 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/badge-title.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences/badge-title.js.es6
@@ -1,27 +1,26 @@
import { ajax } from 'discourse/lib/ajax';
import BadgeSelectController from "discourse/mixins/badge-select-controller";
-export default Ember.ArrayController.extend(BadgeSelectController, {
+export default Ember.Controller.extend(BadgeSelectController, {
filteredList: function() {
return this.get('model').filterBy('badge.allow_title', true);
}.property('model'),
actions: {
- save: function() {
+ save() {
this.setProperties({ saved: false, saving: true });
- var self = this;
ajax(this.get('user.path') + "/preferences/badge_title", {
type: "PUT",
- data: { user_badge_id: self.get('selectedUserBadgeId') }
- }).then(function() {
- self.setProperties({
+ data: { user_badge_id: this.get('selectedUserBadgeId') }
+ }).then(() => {
+ this.setProperties({
saved: true,
saving: false,
- "user.title": self.get('selectedUserBadge.badge.name')
+ "user.title": this.get('selectedUserBadge.badge.name')
});
- }, function() {
+ }, () => {
bootbox.alert(I18n.t('generic_error'));
});
}
diff --git a/app/assets/javascripts/discourse/controllers/preferences/card-badge.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/card-badge.js.es6
index d0c42fb5587..9f820f9647f 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/card-badge.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences/card-badge.js.es6
@@ -1,7 +1,7 @@
import { ajax } from 'discourse/lib/ajax';
import BadgeSelectController from "discourse/mixins/badge-select-controller";
-export default Ember.ArrayController.extend(BadgeSelectController, {
+export default Ember.Controller.extend(BadgeSelectController, {
filteredList: function() {
return this.get('model').filter(function(b) {
return !Ember.isEmpty(b.get('badge.image'));
@@ -12,18 +12,17 @@ export default Ember.ArrayController.extend(BadgeSelectController, {
save: function() {
this.setProperties({ saved: false, saving: true });
- var self = this;
ajax(this.get('user.path') + "/preferences/card-badge", {
type: "PUT",
- data: { user_badge_id: self.get('selectedUserBadgeId') }
- }).then(function() {
- self.setProperties({
+ data: { user_badge_id: this.get('selectedUserBadgeId') }
+ }).then(() => {
+ this.setProperties({
saved: true,
saving: false,
- "user.card_image_badge": self.get('selectedUserBadge.badge.image')
+ "user.card_image_badge": this.get('selectedUserBadge.badge.image')
});
- }).catch(function() {
- self.set('saving', false);
+ }).catch(() => {
+ this.set('saving', false);
bootbox.alert(I18n.t('generic_error'));
});
}
diff --git a/app/assets/javascripts/discourse/controllers/preferences/email.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/email.js.es6
index 099e4a1e689..e125dd73f31 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/email.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences/email.js.es6
@@ -1,4 +1,7 @@
import { propertyEqual } from 'discourse/lib/computed';
+import InputValidation from 'discourse/models/input-validation';
+import { emailValid } from 'discourse/lib/utilities';
+import computed from 'ember-addons/ember-computed-decorators';
export default Ember.Controller.extend({
taken: false,
@@ -8,7 +11,7 @@ export default Ember.Controller.extend({
newEmail: null,
newEmailEmpty: Em.computed.empty('newEmail'),
- saveDisabled: Em.computed.or('saving', 'newEmailEmpty', 'taken', 'unchanged'),
+ saveDisabled: Em.computed.or('saving', 'newEmailEmpty', 'taken', 'unchanged', 'invalidEmail'),
unchanged: propertyEqual('newEmailLower', 'currentUser.email'),
newEmailLower: function() {
@@ -20,6 +23,21 @@ export default Ember.Controller.extend({
return I18n.t("user.change");
}.property('saving'),
+ @computed('newEmail')
+ invalidEmail(newEmail) {
+ return !emailValid(newEmail);
+ },
+
+ @computed('invalidEmail')
+ emailValidation(invalidEmail) {
+ if (invalidEmail) {
+ return InputValidation.create({
+ failed: true,
+ reason: I18n.t('user.email.invalid')
+ });
+ }
+ },
+
actions: {
changeEmail: function() {
var self = this;
diff --git a/app/assets/javascripts/discourse/controllers/preferences/username.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/username.js.es6
index c1976a91fbc..a597df810a4 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/username.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences/username.js.es6
@@ -39,18 +39,19 @@ export default Ember.Controller.extend({
}.property('saving'),
actions: {
- changeUsername: function() {
- var self = this;
- return bootbox.confirm(I18n.t("user.change_username.confirm"), I18n.t("no_value"), I18n.t("yes_value"), function(result) {
+ changeUsername() {
+ if (this.get('saveDisabled')) { return; }
+
+ return bootbox.confirm(I18n.t("user.change_username.confirm"),
+ I18n.t("no_value"),
+ I18n.t("yes_value"), result => {
if (result) {
- self.set('saving', true);
- self.get('content').changeUsername(self.get('newUsername')).then(function() {
- DiscourseURL.redirectTo("/users/" + self.get('newUsername').toLowerCase() + "/preferences");
- }, function() {
- // error
- self.set('error', true);
- self.set('saving', false);
- });
+ this.set('saving', true);
+ this.get('content').changeUsername(this.get('newUsername')).then(() => {
+ DiscourseURL.redirectTo("/users/" + this.get('newUsername').toLowerCase() + "/preferences");
+ })
+ .catch(() => this.set('error', true))
+ .finally(() => this.set('saving', false));
}
});
}
diff --git a/app/assets/javascripts/discourse/controllers/quote-button.js.es6 b/app/assets/javascripts/discourse/controllers/quote-button.js.es6
deleted file mode 100644
index f3e0447a7f3..00000000000
--- a/app/assets/javascripts/discourse/controllers/quote-button.js.es6
+++ /dev/null
@@ -1,159 +0,0 @@
-import Quote from 'discourse/lib/quote';
-import computed from 'ember-addons/ember-computed-decorators';
-import { selectedText } from 'discourse/lib/utilities';
-
-export default Ember.Controller.extend({
- needs: ['topic', 'composer'],
-
- @computed('buffer', 'postId')
- post(buffer, postId) {
- if (!postId || Ember.isEmpty(buffer)) { return null; }
-
- const postStream = this.get('controllers.topic.model.postStream');
- const post = postStream.findLoadedPost(postId);
-
- return post;
- },
-
- // Save the currently selected text and displays the
- // "quote reply" button
- selectText(postId) {
- // anonymous users cannot "quote-reply"
- if (!this.currentUser) return;
-
- // don't display the "quote-reply" button if we can't reply
- const topicDetails = this.get('controllers.topic.model.details');
- if (!(topicDetails.get('can_reply_as_new_topic') || topicDetails.get('can_create_post'))) {
- return;
- }
-
- const selection = window.getSelection();
-
- // no selections
- if (selection.isCollapsed) {
- this.set('buffer', '');
- return;
- }
-
- // retrieve the selected range
- const range = selection.getRangeAt(0),
- cloned = range.cloneRange(),
- $ancestor = $(range.commonAncestorContainer);
-
- if ($ancestor.closest('.cooked').length === 0) {
- this.set('buffer', '');
- return;
- }
-
- const selVal = selectedText();
- if (this.get('buffer') === selVal) return;
-
- // we need to retrieve the post data from the posts collection in the topic controller
- this.set('postId', postId);
- this.set('buffer', selVal);
-
- // create a marker element
- const markerElement = document.createElement("span");
- // containing a single invisible character
- markerElement.appendChild(document.createTextNode("\ufeff"));
-
- const isMobileDevice = this.site.isMobileDevice;
- const capabilities = this.capabilities,
- isIOS = capabilities.isIOS,
- isAndroid = capabilities.isAndroid;
-
- // collapse the range at the beginning/end of the selection
- range.collapse(!isMobileDevice);
- // and insert it at the start of our selection range
- range.insertNode(markerElement);
-
- // retrieve the position of the marker
- const $markerElement = $(markerElement),
- markerOffset = $markerElement.offset(),
- parentScrollLeft = $markerElement.parent().scrollLeft(),
- $quoteButton = $('.quote-button');
-
- // remove the marker
- markerElement.parentNode.removeChild(markerElement);
-
- // work around Chrome that would sometimes lose the selection
- const sel = window.getSelection();
- sel.removeAllRanges();
- sel.addRange(cloned);
-
- // move the quote button above the marker
- Em.run.schedule('afterRender', function() {
- let topOff = markerOffset.top;
- let leftOff = markerOffset.left;
-
- if (parentScrollLeft > 0) leftOff += parentScrollLeft;
-
- if (isMobileDevice || isIOS || isAndroid) {
- topOff = topOff + 20;
- leftOff = Math.min(leftOff + 10, $(window).width() - $quoteButton.outerWidth());
- } else {
- topOff = topOff - $quoteButton.outerHeight() - 5;
- }
-
- $quoteButton.offset({ top: topOff, left: leftOff });
- });
- },
-
- quoteText() {
- const Composer = require('discourse/models/composer').default;
- const postId = this.get('postId');
- const post = this.get('post');
-
- // defer load if needed, if in an expanded replies section
- if (!post) {
- const postStream = this.get('controllers.topic.model.postStream');
- return postStream.loadPost(postId).then(p => {
- this.set('post', p);
- return this.quoteText();
- });
- }
-
- // If we can't create a post, delegate to reply as new topic
- if (!this.get('controllers.topic.model.details.can_create_post')) {
- this.get('controllers.topic').send('replyAsNewTopic', post);
- return;
- }
-
- const composerController = this.get('controllers.composer');
- const composerOpts = {
- action: Composer.REPLY,
- draftKey: post.get('topic.draft_key')
- };
-
- if (post.get('post_number') === 1) {
- composerOpts.topic = post.get("topic");
- } else {
- composerOpts.post = post;
- }
-
- // If the composer is associated with a different post, we don't change it.
- const composerPost = composerController.get('content.post');
- if (composerPost && (composerPost.get('id') !== this.get('post.id'))) {
- composerOpts.post = composerPost;
- }
-
- const buffer = this.get('buffer');
- const quotedText = Quote.build(post, buffer);
- composerOpts.quote = quotedText;
- if (composerController.get('content.viewOpen') || composerController.get('content.viewDraft')) {
- this.appEvents.trigger('composer:insert-text', quotedText);
- } else {
- composerController.open(composerOpts);
- }
- this.set('buffer', '');
- return false;
- },
-
- deselectText() {
- // clear selected text
- window.getSelection().removeAllRanges();
- // clean up the buffer
- this.set('buffer', '');
- }
-
-});
diff --git a/app/assets/javascripts/discourse/controllers/reorder-categories.js.es6 b/app/assets/javascripts/discourse/controllers/reorder-categories.js.es6
index 18a000a3884..c975eb5bfb3 100644
--- a/app/assets/javascripts/discourse/controllers/reorder-categories.js.es6
+++ b/app/assets/javascripts/discourse/controllers/reorder-categories.js.es6
@@ -5,8 +5,6 @@ import { popupAjaxError } from 'discourse/lib/ajax-error';
import { on, default as computed } from "ember-addons/ember-computed-decorators";
import Ember from 'ember';
-const SortableArrayProxy = Ember.ArrayProxy.extend(Ember.SortableMixin);
-
export default Ember.Controller.extend(ModalFunctionality, Ember.Evented, {
@on('init')
@@ -20,12 +18,8 @@ export default Ember.Controller.extend(ModalFunctionality, Ember.Evented, {
return categories.map(c => bufProxy.create({ content: c }));
},
- categoriesOrdered: function() {
- return SortableArrayProxy.create({
- sortProperties: ['content.position'],
- content: this.get('categoriesBuffered')
- });
- }.property('categoriesBuffered'),
+ categoriesSorting: ['position'],
+ categoriesOrdered: Ember.computed.sort('categoriesBuffered', 'categoriesSorting'),
showFixIndices: function() {
const cats = this.get('categoriesOrdered');
diff --git a/app/assets/javascripts/discourse/controllers/search-help.js.es6 b/app/assets/javascripts/discourse/controllers/search-help.js.es6
index 7f5958ae4de..0d5bb501047 100644
--- a/app/assets/javascripts/discourse/controllers/search-help.js.es6
+++ b/app/assets/javascripts/discourse/controllers/search-help.js.es6
@@ -1,8 +1,6 @@
import ModalFunctionality from 'discourse/mixins/modal-functionality';
export default Ember.Controller.extend(ModalFunctionality, {
- needs: ['modal'],
-
showGoogleSearch: function() {
return !Discourse.SiteSettings.login_required;
}.property()
diff --git a/app/assets/javascripts/discourse/controllers/share.js.es6 b/app/assets/javascripts/discourse/controllers/share.js.es6
deleted file mode 100644
index 97f1fb4d267..00000000000
--- a/app/assets/javascripts/discourse/controllers/share.js.es6
+++ /dev/null
@@ -1,56 +0,0 @@
-import Sharing from 'discourse/lib/sharing';
-import { longDateNoYear } from 'discourse/lib/formatter';
-import computed from 'ember-addons/ember-computed-decorators';
-
-export default Ember.Controller.extend({
- needs: ['topic'],
-
- title: Ember.computed.alias('controllers.topic.model.title'),
- canReplyAsNewTopic: Ember.computed.alias('controllers.topic.model.details.can_reply_as_new_topic'),
-
- @computed('type', 'postNumber')
- shareTitle(type, postNumber) {
- if (type === 'topic') { return I18n.t('share.topic'); }
- if (postNumber) {
- return I18n.t('share.post', { postNumber });
- } else {
- return I18n.t('share.topic');
- }
- },
-
- @computed('date')
- displayDate(date) {
- return longDateNoYear(new Date(date));
- },
-
- // Close the share controller
- actions: {
- close() {
- this.setProperties({ link: null, postNumber: null, postId: null });
- return false;
- },
-
- replyAsNewTopic() {
- const topicController = this.get("controllers.topic");
- const postStream = topicController.get("model.postStream");
- const postId = this.get("postId") || postStream.findPostIdForPostNumber(1);
- const post = postStream.findLoadedPost(postId);
- topicController.send("replyAsNewTopic", post);
- this.send("close");
- },
-
- share(source) {
- var url = source.generateUrl(this.get('link'), this.get('title'));
- if (source.shouldOpenInPopup) {
- window.open(url, '', 'menubar=no,toolbar=no,resizable=yes,scrollbars=yes,width=600,height=' + (source.popupHeight || 315));
- } else {
- window.open(url, '_blank');
- }
- }
- },
-
- @computed
- sources() {
- return Sharing.activeSources(this.siteSettings.share_links);
- }
-});
diff --git a/app/assets/javascripts/discourse/controllers/split-topic.js.es6 b/app/assets/javascripts/discourse/controllers/split-topic.js.es6
index b8a1a72509e..c8ea321570e 100644
--- a/app/assets/javascripts/discourse/controllers/split-topic.js.es6
+++ b/app/assets/javascripts/discourse/controllers/split-topic.js.es6
@@ -6,12 +6,11 @@ import DiscourseURL from 'discourse/lib/url';
// Modal related to auto closing of topics
export default Ember.Controller.extend(SelectedPostsCount, ModalFunctionality, {
- needs: ['topic'],
topicName: null,
saving: false,
categoryId: null,
- topicController: Em.computed.alias('controllers.topic'),
+ topicController: Ember.inject.controller('topic'),
selectedPosts: Em.computed.alias('topicController.selectedPosts'),
selectedReplies: Em.computed.alias('topicController.selectedReplies'),
allPostsSelected: Em.computed.alias('topicController.allPostsSelected'),
@@ -28,7 +27,7 @@ export default Ember.Controller.extend(SelectedPostsCount, ModalFunctionality, {
onShow() {
this.setProperties({
- 'controllers.modal.modalClass': 'split-modal',
+ 'modal.modalClass': 'split-modal',
saving: false,
categoryId: null,
topicName: ''
diff --git a/app/assets/javascripts/discourse/controllers/static.js.es6 b/app/assets/javascripts/discourse/controllers/static.js.es6
index c656b99dfd7..166a0676a7f 100644
--- a/app/assets/javascripts/discourse/controllers/static.js.es6
+++ b/app/assets/javascripts/discourse/controllers/static.js.es6
@@ -2,14 +2,16 @@ import { ajax } from 'discourse/lib/ajax';
import computed from 'ember-addons/ember-computed-decorators';
export default Ember.Controller.extend({
-
- needs: ['application'],
+ application: Ember.inject.controller(),
showLoginButton: Em.computed.equal("model.path", "login"),
+ @computed('model.path')
+ bodyClass: path => `static-${path}`,
+
@computed("model.path")
showSignupButton() {
- return this.get("model.path") === "login" && this.get('controllers.application.canSignUp');
+ return this.get("model.path") === "login" && this.get('application.canSignUp');
},
actions: {
diff --git a/app/assets/javascripts/discourse/controllers/tag-groups-show.js.es6 b/app/assets/javascripts/discourse/controllers/tag-groups-show.js.es6
index 1eca5728abb..d575844cad9 100644
--- a/app/assets/javascripts/discourse/controllers/tag-groups-show.js.es6
+++ b/app/assets/javascripts/discourse/controllers/tag-groups-show.js.es6
@@ -1,5 +1,5 @@
export default Ember.Controller.extend({
- needs: ['tagGroups'],
+ tagGroups: Ember.inject.controller(),
actions: {
save() {
@@ -7,17 +7,16 @@ export default Ember.Controller.extend({
},
destroy() {
- const self = this;
return bootbox.confirm(
I18n.t("tagging.groups.confirm_delete"),
I18n.t("no_value"),
I18n.t("yes_value"),
- function(destroy) {
+ destroy => {
if (destroy) {
- const c = self.controllerFor('tagGroups');
- return self.get('model').destroy().then(function() {
- c.removeObject(self.get('model'));
- self.transitionToRoute('tagGroups');
+ const c = this.get('tagGroups.model');
+ return this.get('model').destroy().then(() => {
+ c.removeObject(this.get('model'));
+ this.transitionToRoute('tagGroups');
});
}
}
diff --git a/app/assets/javascripts/discourse/controllers/tag-groups.js.es6 b/app/assets/javascripts/discourse/controllers/tag-groups.js.es6
index 4e52a8ce476..7ea16868797 100644
--- a/app/assets/javascripts/discourse/controllers/tag-groups.js.es6
+++ b/app/assets/javascripts/discourse/controllers/tag-groups.js.es6
@@ -1,6 +1,8 @@
-export default Ember.ArrayController.extend({
+import TagGroup from 'discourse/models/tag-group';
+
+export default Ember.Controller.extend({
actions: {
- selectTagGroup: function(tagGroup) {
+ selectTagGroup(tagGroup) {
if (this.get('selectedItem')) { this.get('selectedItem').set('selected', false); }
this.set('selectedItem', tagGroup);
tagGroup.set('selected', true);
@@ -8,10 +10,9 @@ export default Ember.ArrayController.extend({
this.transitionToRoute('tagGroups.show', tagGroup);
},
- newTagGroup: function() {
- const newTagGroup = this.store.createRecord('tag-group');
- newTagGroup.set('name', I18n.t('tagging.groups.new_name'));
- this.pushObject(newTagGroup);
+ newTagGroup() {
+ const newTagGroup = TagGroup.create({ id: 'new', name: I18n.t('tagging.groups.new_name') });
+ this.get('model').pushObject(newTagGroup);
this.send('selectTagGroup', newTagGroup);
}
}
diff --git a/app/assets/javascripts/discourse/controllers/tags-show.js.es6 b/app/assets/javascripts/discourse/controllers/tags-show.js.es6
index 34c4729228f..1e8e0c2fa0b 100644
--- a/app/assets/javascripts/discourse/controllers/tags-show.js.es6
+++ b/app/assets/javascripts/discourse/controllers/tags-show.js.es6
@@ -16,7 +16,7 @@ if (customNavItemHref) {
if (navItem.get('tagId')) {
var name = navItem.get('name');
- if ( !Discourse.Site.currentProp('filters').contains(name) ) {
+ if ( !Discourse.Site.currentProp('filters').includes(name) ) {
return null;
}
@@ -40,9 +40,10 @@ if (customNavItemHref) {
export default Ember.Controller.extend(BulkTopicSelection, {
- needs: ["application"],
+ application: Ember.inject.controller(),
tag: null,
+ additionalTags: null,
list: null,
canAdminTag: Ember.computed.alias("currentUser.staff"),
filterMode: null,
@@ -72,15 +73,15 @@ export default Ember.Controller.extend(BulkTopicSelection, {
}.property(),
showAdminControls: function() {
- return this.get('canAdminTag') && !this.get('category');
- }.property('canAdminTag', 'category'),
+ return !this.get('additionalTags') && this.get('canAdminTag') && !this.get('category');
+ }.property('additionalTags', 'canAdminTag', 'category'),
loadMoreTopics() {
return this.get("list").loadMore();
},
_showFooter: function() {
- this.set("controllers.application.showFooter", !this.get("list.canLoadMore"));
+ this.set("application.showFooter", !this.get("list.canLoadMore"));
}.observes("list.canLoadMore"),
footerMessage: function() {
diff --git a/app/assets/javascripts/discourse/controllers/topic-bulk-actions.js.es6 b/app/assets/javascripts/discourse/controllers/topic-bulk-actions.js.es6
index e1c710115c3..e3a7a34f217 100644
--- a/app/assets/javascripts/discourse/controllers/topic-bulk-actions.js.es6
+++ b/app/assets/javascripts/discourse/controllers/topic-bulk-actions.js.es6
@@ -17,14 +17,14 @@ addBulkButton('unlistTopics', 'unlist_topics');
addBulkButton('showTagTopics', 'change_tags');
// Modal for performing bulk actions on topics
-export default Ember.ArrayController.extend(ModalFunctionality, {
+export default Ember.Controller.extend(ModalFunctionality, {
tags: null,
buttonRows: null,
emptyTags: Ember.computed.empty('tags'),
onShow() {
- this.set('controllers.modal.modalClass', 'topic-bulk-actions-modal small');
+ this.set('modal.modalClass', 'topic-bulk-actions-modal small');
const buttonRows = [];
let row = [];
@@ -38,7 +38,7 @@ export default Ember.ArrayController.extend(ModalFunctionality, {
if (row.length) { buttonRows.push(row); }
this.set('buttonRows', buttonRows);
- this.send('changeBulkTemplate', 'modal/bulk_actions_buttons');
+ this.send('changeBulkTemplate', 'modal/bulk-actions-buttons');
},
perform(operation) {
@@ -85,12 +85,12 @@ export default Ember.ArrayController.extend(ModalFunctionality, {
},
showChangeCategory() {
- this.send('changeBulkTemplate', 'modal/bulk_change_category');
- this.set('controllers.modal.modalClass', 'topic-bulk-actions-modal full');
+ this.send('changeBulkTemplate', 'modal/bulk-change-category');
+ this.set('modal.modalClass', 'topic-bulk-actions-modal full');
},
showNotificationLevel() {
- this.send('changeBulkTemplate', 'modal/bulk_notification_level');
+ this.send('changeBulkTemplate', 'modal/bulk-notification-level');
},
deleteTopics() {
diff --git a/app/assets/javascripts/discourse/controllers/topic-entrance.js.es6 b/app/assets/javascripts/discourse/controllers/topic-entrance.js.es6
deleted file mode 100644
index 4a7fdf61c61..00000000000
--- a/app/assets/javascripts/discourse/controllers/topic-entrance.js.es6
+++ /dev/null
@@ -1,63 +0,0 @@
-import DiscourseURL from 'discourse/lib/url';
-
-function entranceDate(dt, showTime) {
- const today = new Date();
-
- if (dt.toDateString() === today.toDateString()) {
- return moment(dt).format(I18n.t("dates.time"));
- }
-
- if (dt.getYear() === today.getYear()) {
- // No year
- return moment(dt).format(
- showTime ? I18n.t("dates.long_date_without_year_with_linebreak") : I18n.t("dates.long_no_year_no_time")
- );
- }
-
- return moment(dt).format(
- showTime ? I18n.t('dates.long_date_with_year_with_linebreak') : I18n.t('dates.long_date_with_year_without_time')
- );
-}
-
-export default Ember.Controller.extend({
- position: null,
-
- createdDate: function() {
- return new Date(this.get('model.created_at'));
- }.property('model.created_at'),
-
- bumpedDate: function() {
- return new Date(this.get('model.bumped_at'));
- }.property('model.bumped_at'),
-
- showTime: function() {
- var diffMs = this.get('bumpedDate').getTime() - this.get('createdDate').getTime();
- return diffMs < (1000 * 60 * 60 * 24 * 2);
- }.property('createdDate', 'bumpedDate'),
-
- topDate: function() {
- return entranceDate(this.get('createdDate'), this.get('showTime'));
- }.property('createdDate'),
-
- bottomDate: function() {
- return entranceDate(this.get('bumpedDate'), this.get('showTime'));
- }.property('bumpedDate'),
-
- actions: {
- show(data) {
- // Show the chooser but only if the model changes
- if (this.get('model') !== data.topic) {
- this.set('model', data.topic);
- this.set('position', data.position);
- }
- },
-
- enterTop() {
- DiscourseURL.routeTo(this.get('model.url'));
- },
-
- enterBottom() {
- DiscourseURL.routeTo(this.get('model.lastPostUrl'));
- }
- }
-});
diff --git a/app/assets/javascripts/discourse/controllers/topic.js.es6 b/app/assets/javascripts/discourse/controllers/topic.js.es6
index a21d55ca328..6bedd2b5f33 100644
--- a/app/assets/javascripts/discourse/controllers/topic.js.es6
+++ b/app/assets/javascripts/discourse/controllers/topic.js.es6
@@ -9,40 +9,34 @@ import Composer from 'discourse/models/composer';
import DiscourseURL from 'discourse/lib/url';
import { categoryBadgeHTML } from 'discourse/helpers/category-link';
import Post from 'discourse/models/post';
+import debounce from 'discourse/lib/debounce';
+import isElementInViewport from "discourse/lib/is-element-in-viewport";
+import QuoteState from 'discourse/lib/quote-state';
export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, {
- needs: ['modal', 'composer', 'quote-button', 'application'],
+ composer: Ember.inject.controller(),
+ application: Ember.inject.controller(),
multiSelect: false,
allPostsSelected: false,
editingTopic: false,
selectedPosts: null,
selectedReplies: null,
- queryParams: ['filter', 'username_filters', 'show_deleted'],
+ queryParams: ['filter', 'username_filters'],
loadedAllPosts: Ember.computed.or('model.postStream.loadedAllPosts', 'model.postStream.loadingLastPost'),
enteredAt: null,
enteredIndex: null,
retrying: false,
userTriggeredProgress: null,
_progressIndex: null,
+ hasScrolled: null,
+ username_filters: null,
+ filter: null,
+ quoteState: null,
- topicDelegated: [
- 'toggleMultiSelect',
- 'deleteTopic',
- 'recoverTopic',
- 'toggleClosed',
- 'showAutoClose',
- 'showFeatureTopic',
- 'showChangeTimestamp',
- 'toggleArchived',
- 'toggleVisibility',
- 'convertToPublicTopic',
- 'convertToPrivateMessage',
- 'jumpTop',
- 'jumpToPost',
- 'jumpToIndex',
- 'jumpBottom',
- 'replyToPost'
- ],
+ updateQueryParams() {
+ const postStream = this.get('model.postStream');
+ this.setProperties(postStream.get('streamFilters'));
+ },
_titleChanged: function() {
const title = this.get('model.title');
@@ -70,32 +64,6 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, {
return this.capabilities.isAndroid && loading;
},
- @computed('model.postStream.summary')
- show_deleted: {
- set(value) {
- const postStream = this.get('model.postStream');
- if (!postStream) { return; }
- postStream.set('show_deleted', value);
- return postStream.get('show_deleted') ? true : undefined;
- },
- get() {
- return this.get('postStream.show_deleted') ? true : undefined;
- }
- },
-
- @computed('model.postStream.summary')
- filter: {
- set(value) {
- const postStream = this.get('model.postStream');
- if (!postStream) { return; }
- postStream.set('summary', value === "summary");
- return postStream.get('summary') ? "summary" : undefined;
- },
- get() {
- return this.get('postStream.summary') ? "summary" : undefined;
- }
- },
-
@computed('model', 'topicTrackingState.messageCount')
browseMoreMessage(model) {
@@ -144,27 +112,16 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, {
@computed('model')
suggestedTitle(model) {
return model.get('isPrivateMessage') ?
- ` ${I18n.t("suggested_topics.pm_title")}` :
+ ` ${I18n.t("suggested_topics.pm_title")}` :
I18n.t("suggested_topics.title");
},
- @computed('model.postStream.streamFilters.username_filters')
- username_filters: {
- set(value) {
- const postStream = this.get('model.postStream');
- if (!postStream) { return; }
- postStream.set('streamFilters.username_filters', value);
- return postStream.get('streamFilters.username_filters');
- },
- get() {
- return this.get('postStream.streamFilters.username_filters');
- }
- },
-
- _clearSelected: function() {
+ init() {
+ this._super();
this.set('selectedPosts', []);
this.set('selectedReplies', []);
- }.on('init'),
+ this.set('quoteState', new QuoteState());
+ },
showCategoryChooser: Ember.computed.not("model.isPrivateMessage"),
@@ -180,6 +137,14 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, {
return post => this.postSelected(post);
}.property(),
+ @computed('model.isPrivateMessage', 'model.category.id')
+ canEditTopicFeaturedLink(isPrivateMessage, categoryId) {
+ if (!this.siteSettings.topic_featured_link_enabled || isPrivateMessage) { return false; }
+
+ const categoryIds = this.site.get('topic_featured_link_allowed_category_ids');
+ return categoryIds === undefined || !categoryIds.length || categoryIds.indexOf(categoryId) !== -1;
+ },
+
@computed('model.isPrivateMessage')
canEditTags(isPrivateMessage) {
return !isPrivateMessage && this.site.get('can_tag_topics');
@@ -187,6 +152,64 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, {
actions: {
+ showPostFlags(post) {
+ return this.send('showFlags', post);
+ },
+
+ topicRouteAction(name, model) {
+ return this.send(name, model);
+ },
+
+ openAutoClose() {
+ this.send('showAutoClose');
+ },
+
+ openFeatureTopic() {
+ this.send('showFeatureTopic');
+ },
+
+ selectText(postId, buffer) {
+ return this.get('model.postStream').loadPost(postId).then(post => {
+ const composer = this.get('composer');
+ const viewOpen = composer.get('model.viewOpen');
+
+ // If we can't create a post, delegate to reply as new topic
+ if ((!viewOpen) && (!this.get('model.details.can_create_post'))) {
+ this.send('replyAsNewTopic', post);
+ return;
+ }
+
+ const composerOpts = {
+ action: Composer.REPLY,
+ draftKey: post.get('topic.draft_key')
+ };
+
+ if (post.get('post_number') === 1) {
+ composerOpts.topic = post.get("topic");
+ } else {
+ composerOpts.post = post;
+ }
+
+ // If the composer is associated with a different post, we don't change it.
+ const composerPost = composer.get('model.post');
+ if (composerPost && (composerPost.get('id') !== this.get('post.id'))) {
+ composerOpts.post = composerPost;
+ }
+
+ const quotedText = Quote.build(post, buffer);
+ composerOpts.quote = quotedText;
+ if (composer.get('model.viewOpen')) {
+ this.appEvents.trigger('composer:insert-text', quotedText);
+ } else if (composer.get('model.viewDraft')) {
+ const model = composer.get('model');
+ model.set('reply', model.get('reply') + quotedText);
+ composer.send('openIfDraft');
+ } else {
+ composer.open(composerOpts);
+ }
+ });
+ },
+
fillGapBefore(args) {
return this.get('model.postStream').fillGapBefore(args.post, args.gap);
},
@@ -250,7 +273,9 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, {
},
toggleSummary() {
- return this.get('model.postStream').toggleSummary();
+ return this.get('model.postStream').toggleSummary().then(() => {
+ this.updateQueryParams();
+ });
},
removeAllowedUser(user) {
@@ -265,28 +290,33 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, {
this.deleteTopic();
},
- archiveMessage() {
+ // Archive a PM (as opposed to archiving a topic)
+ toggleArchiveMessage() {
const topic = this.get('model');
- topic.archiveMessage().then(()=>{
- this.gotoInbox(topic.get("inboxGroupName"));
- });
- },
+ if (topic.get('archiving')) { return; }
- moveToInbox() {
- const topic = this.get('model');
- topic.moveToInbox().then(()=>{
- this.gotoInbox(topic.get("inboxGroupName"));
- });
+ if (topic.get('message_archived')) {
+ topic.moveToInbox().then(()=>{
+ this.gotoInbox(topic.get("inboxGroupName"));
+ });
+ } else {
+ topic.archiveMessage().then(()=>{
+ this.gotoInbox(topic.get("inboxGroupName"));
+ });
+ }
},
// Post related methods
replyToPost(post) {
- const composerController = this.get('controllers.composer'),
- quoteController = this.get('controllers.quote-button'),
- quotedText = Quote.build(quoteController.get('post'), quoteController.get('buffer')),
- topic = post ? post.get('topic') : this.get('model');
+ const composerController = this.get('composer');
+ const topic = post ? post.get('topic') : this.get('model');
- quoteController.set('buffer', '');
+ const quoteState = this.get('quoteState');
+ const postStream = this.get('model.postStream');
+ const quotedPost = postStream.findLoadedPost(quoteState.postId);
+ const quotedText = Quote.build(quotedPost, quoteState.buffer);
+
+ quoteState.clear();
if (composerController.get('content.topic.id') === topic.get('id') &&
composerController.get('content.action') === Composer.REPLY) {
@@ -379,7 +409,7 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, {
return false;
}
- const composer = this.get('controllers.composer'),
+ const composer = this.get('composer'),
composerModel = composer.get('model'),
opts = {
post: post,
@@ -415,10 +445,26 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, {
this._jumpToPostId(this.get('model.postStream.stream')[index-1]);
},
- jumpToPost(postNumber) {
+ jumpToPostPrompt() {
+ const postText = prompt(I18n.t('topic.progress.jump_prompt_long'));
+ if (postText === null) { return; }
+ const postNumber = parseInt(postText, 10);
+ if (postNumber === 0) { return; }
this._jumpToPostId(this.get('model.postStream').findPostIdForPostNumber(postNumber));
},
+ jumpToPost(postNumber) {
+ const postStream = this.get('model.postStream');
+ let postId = postStream.findPostIdForPostNumber(postNumber);
+
+ // If we couldn't find the post, find the closest post to it
+ if (!postId) {
+ const closest = postStream.closestPostNumberFor(postNumber);
+ postId = postStream.findPostIdForPostNumber(closest);
+ }
+ this._jumpToPostId(postId);
+ },
+
jumpTop() {
DiscourseURL.routeTo(this.get('model.firstPostUrl'), { skipIfOnScreen: false });
},
@@ -445,7 +491,10 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, {
},
toggleParticipant(user) {
- this.get('model.postStream').toggleParticipant(Em.get(user, 'username'));
+ const postStream = this.get('model.postStream');
+ postStream.toggleParticipant(Ember.get(user, 'username')).then(() => {
+ this.updateQueryParams();
+ });
},
editTopic() {
@@ -601,12 +650,11 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, {
},
replyAsNewTopic(post) {
- const composerController = this.get('controllers.composer');
- const quoteController = this.get('controllers.quote-button');
- post = post || quoteController.get('post');
- const quotedText = Quote.build(post, quoteController.get('buffer'));
+ const composerController = this.get('composer');
- quoteController.deselectText();
+ const { quoteState } = this;
+ const quotedText = Quote.build(post, quoteState.buffer);
+ quoteState.clear();
composerController.open({
action: Composer.CREATE_TOPIC,
@@ -638,7 +686,6 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, {
togglePostType(post) {
const regular = this.site.get('post_types.regular');
const moderator = this.site.get('post_types.moderator_action');
-
return post.updatePostField('post_type', post.get('post_type') === moderator ? regular : moderator);
},
@@ -670,9 +717,12 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, {
return;
}
+ this.appEvents.trigger('topic:jump-to-post', postId);
+
const topic = this.get('model');
const postStream = topic.get('postStream');
const post = postStream.findLoadedPost(postId);
+
if (post) {
DiscourseURL.routeTo(topic.urlForPostNumber(post.get('post_number')));
} else {
@@ -687,6 +737,12 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, {
this.send('togglePinnedForUser');
},
+ print() {
+ if (this.siteSettings.max_prints_per_hour_per_user > 0) {
+ window.open(this.get('model.printUrl'), '', 'menubar=no,toolbar=no,resizable=yes,scrollbars=yes,width=600,height=315');
+ }
+ },
+
canMergeTopic: function() {
if (!this.get('model.details.can_move_posts')) return false;
return this.get('selectedPostsCount') > 0;
@@ -753,7 +809,7 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, {
const selectedReplies = this.get('selectedReplies');
selectedReplies.removeObject(post);
- const selectedReply = selectedReplies.findProperty('post_number', post.get('reply_to_post_number'));
+ const selectedReply = selectedReplies.findBy('post_number', post.get('reply_to_post_number'));
if (selectedReply) { selectedReplies.removeObject(selectedReply); }
this.set('allPostsSelected', false);
@@ -761,8 +817,8 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, {
postSelected(post) {
if (this.get('allPostsSelected')) { return true; }
- if (this.get('selectedPosts').contains(post)) { return true; }
- if (this.get('selectedReplies').findProperty('post_number', post.get('reply_to_post_number'))) { return true; }
+ if (this.get('selectedPosts').includes(post)) { return true; }
+ if (this.get('selectedReplies').findBy('post_number', post.get('reply_to_post_number'))) { return true; }
return false;
},
@@ -837,10 +893,35 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, {
topic.reload().then(() => {
this.send('postChangedRoute', topic.get('post_number') || 1);
});
+ } else {
+ if (topic.get('isPrivateMessage') &&
+ this.currentUser &&
+ this.currentUser.get('id') !== data.user_id &&
+ data.type === 'created') {
+
+ const postNumber = data.post_number;
+ const notInPostStream = topic.get('highest_post_number') <= postNumber;
+ const postNumberDifference = postNumber - topic.get('currentPost');
+
+ if (notInPostStream &&
+ postNumberDifference > 0 &&
+ postNumberDifference < 7) {
+
+ this._scrollToPost(data.post_number);
+ }
+ }
}
});
},
+ _scrollToPost: debounce(function(postNumber) {
+ const $post = $(`.topic-post article#post_${postNumber}`);
+
+ if ($post.length === 0 || isElementInViewport($post)) return;
+
+ $('body').animate({ scrollTop: $post.offset().top }, 1000);
+ }, 500),
+
unsubscribe() {
const topicId = this.get('content.id');
if (!topicId) return;
@@ -893,10 +974,9 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, {
}
},
-
_showFooter: function() {
const showFooter = this.get("model.postStream.loaded") && this.get("model.postStream.loadedAllPosts");
- this.set("controllers.application.showFooter", showFooter);
+ this.set("application.showFooter", showFooter);
}.observes("model.postStream.{loaded,loadedAllPosts}")
});
diff --git a/app/assets/javascripts/discourse/controllers/upload-customization.js.es6 b/app/assets/javascripts/discourse/controllers/upload-customization.js.es6
index d7a980a0b42..ae7575887a9 100644
--- a/app/assets/javascripts/discourse/controllers/upload-customization.js.es6
+++ b/app/assets/javascripts/discourse/controllers/upload-customization.js.es6
@@ -2,7 +2,7 @@ import ModalFunctionality from 'discourse/mixins/modal-functionality';
export default Ember.Controller.extend(ModalFunctionality, {
notReady: Em.computed.not('ready'),
- needs: ['adminCustomizeCssHtml'],
+ adminCustomizeCssHtml: Ember.inject.controller(),
ready: function() {
try {
@@ -22,7 +22,7 @@ export default Ember.Controller.extend(ModalFunctionality, {
delete object.id;
delete object.key;
- const controller = this.get('controllers.adminCustomizeCssHtml');
+ const controller = this.get('adminCustomizeCssHtml');
controller.send('newCustomization', object);
}
}
diff --git a/app/assets/javascripts/discourse/controllers/upload-selector.js.es6 b/app/assets/javascripts/discourse/controllers/upload-selector.js.es6
index bc083efcc4f..0fee68472b5 100644
--- a/app/assets/javascripts/discourse/controllers/upload-selector.js.es6
+++ b/app/assets/javascripts/discourse/controllers/upload-selector.js.es6
@@ -1,30 +1,37 @@
import ModalFunctionality from 'discourse/mixins/modal-functionality';
-import { default as computed } from 'ember-addons/ember-computed-decorators';
+import { default as computed, observes } from 'ember-addons/ember-computed-decorators';
import { allowsAttachments, authorizesAllExtensions, authorizedExtensions } from 'discourse/lib/utilities';
-export function uploadTranslate(key, options) {
- options = options || {};
+function uploadTranslate(key) {
if (allowsAttachments()) { key += "_with_attachments"; }
- return I18n.t(`upload_selector.${key}`, options);
+ return `upload_selector.${key}`;
}
export default Ember.Controller.extend(ModalFunctionality, {
showMore: false,
- local: true,
imageUrl: null,
imageLink: null,
- remote: Ember.computed.not("local"),
+ local: Ember.computed.equal('selection', 'local'),
+ remote: Ember.computed.equal('selection', 'remote'),
+ selection: 'local',
- @computed
- uploadIcon() {
- return allowsAttachments() ? "upload" : "picture-o";
+ @computed()
+ uploadIcon: () => allowsAttachments() ? "upload" : "picture-o",
+
+ @computed()
+ title: () => uploadTranslate("title"),
+
+ @computed('selection')
+ tip(selection) {
+ const authorized_extensions = authorizesAllExtensions() ? "" : `(${authorizedExtensions()})`;
+ return I18n.t(uploadTranslate(`${selection}_tip`), { authorized_extensions });
},
- @computed('local')
- tip(local) {
- const source = local ? "local" : "remote";
- const authorized_extensions = authorizesAllExtensions() ? "" : `(${authorizedExtensions()})`;
- return uploadTranslate(`${source}_tip`, { authorized_extensions });
+ @observes('selection')
+ _selectionChanged() {
+ if (this.get('local')) {
+ this.set('showMore', false);
+ }
},
actions: {
@@ -45,12 +52,6 @@ export default Ember.Controller.extend(ModalFunctionality, {
this.send('closeModal');
},
- useLocal() {
- this.setProperties({ local: true, showMore: false});
- },
- useRemote() {
- this.set("local", false);
- },
toggleShowMore() {
this.toggleProperty("showMore");
}
diff --git a/app/assets/javascripts/discourse/controllers/user-activity.js.es6 b/app/assets/javascripts/discourse/controllers/user-activity.js.es6
index 55ab7846cae..624a8b0ae79 100644
--- a/app/assets/javascripts/discourse/controllers/user-activity.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-activity.js.es6
@@ -1,11 +1,13 @@
import { exportUserArchive } from 'discourse/lib/export-csv';
export default Ember.Controller.extend({
+ application: Ember.inject.controller(),
+ user: Ember.inject.controller(),
+
userActionType: null,
- needs: ["application", "user"],
- currentPath: Em.computed.alias('controllers.application.currentPath'),
- viewingSelf: Em.computed.alias("controllers.user.viewingSelf"),
- showBookmarks: Em.computed.alias("controllers.user.showBookmarks"),
+ currentPath: Ember.computed.alias('application.currentPath'),
+ viewingSelf: Ember.computed.alias("user.viewingSelf"),
+ showBookmarks: Ember.computed.alias("user.showBookmarks"),
_showFooter: function() {
var showFooter;
@@ -15,13 +17,13 @@ export default Ember.Controller.extend({
} else {
showFooter = this.get("model.statsCountNonPM") <= this.get("model.stream.itemsLoaded");
}
- this.set("controllers.application.showFooter", showFooter);
+ this.set("application.showFooter", showFooter);
}.observes("userActionType", "model.stream.itemsLoaded"),
actions: {
exportUserArchive() {
bootbox.confirm(
- I18n.t("admin.export_csv.user_archive_confirm"),
+ I18n.t("user.download_archive.confirm"),
I18n.t("no_value"),
I18n.t("yes_value"),
function(confirmed) {
diff --git a/app/assets/javascripts/discourse/controllers/user-badges.js.es6 b/app/assets/javascripts/discourse/controllers/user-badges.js.es6
index 76b2a05cd92..3089a073778 100644
--- a/app/assets/javascripts/discourse/controllers/user-badges.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-badges.js.es6
@@ -1,20 +1,6 @@
-export default Ember.ArrayController.extend({
- needs: ["user"],
- user: Em.computed.alias("controllers.user.model"),
- sortProperties: ['badge.badge_type.sort_order', 'badge.name'],
- orderBy: function(ub1, ub2){
- var sr1 = ub1.get('badge.badge_type.sort_order');
- var sr2 = ub2.get('badge.badge_type.sort_order');
-
-
- if(sr1 > sr2) {
- return -1;
- }
-
- if(sr2 > sr1) {
- return 1;
- }
-
- return ub1.get('badge.name') < ub2.get('badge.name') ? -1 : 1;
- }
+export default Ember.Controller.extend({
+ user: Ember.inject.controller(),
+ username: Ember.computed.alias('user.model.username_lower'),
+ sortedBadges: Ember.computed.sort('model', 'badgeSortOrder'),
+ badgeSortOrder: ['badge.badge_type.sort_order', 'badge.name'],
});
diff --git a/app/assets/javascripts/discourse/controllers/user-card.js.es6 b/app/assets/javascripts/discourse/controllers/user-card.js.es6
index 377ffb97a85..bef0267803d 100644
--- a/app/assets/javascripts/discourse/controllers/user-card.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-card.js.es6
@@ -1,149 +1,15 @@
-import DiscourseURL from 'discourse/lib/url';
-import { propertyNotEqual, setting } from 'discourse/lib/computed';
-import computed from 'ember-addons/ember-computed-decorators';
-
export default Ember.Controller.extend({
- needs: ['topic', 'application'],
- visible: false,
- user: null,
- username: null,
- avatar: null,
- userLoading: null,
- cardTarget: null,
- post: null,
-
- // If inside a topic
- topicPostCount: null,
-
- postStream: Em.computed.alias('controllers.topic.model.postStream'),
- enoughPostsForFiltering: Em.computed.gte('topicPostCount', 2),
- viewingTopic: Em.computed.match('controllers.application.currentPath', /^topic\./),
- viewingAdmin: Em.computed.match('controllers.application.currentPath', /^admin\./),
- showFilter: Em.computed.and('viewingTopic', 'postStream.hasNoFilters', 'enoughPostsForFiltering'),
- showName: propertyNotEqual('user.name', 'user.username'),
- hasUserFilters: Em.computed.gt('postStream.userFilters.length', 0),
- isSuspended: Em.computed.notEmpty('user.suspend_reason'),
- showBadges: setting('enable_badges'),
- showMoreBadges: Em.computed.gt('moreBadgesCount', 0),
- showDelete: Em.computed.and("viewingAdmin", "showName", "user.canBeDeleted"),
- linkWebsite: Em.computed.not('user.isBasic'),
- hasLocationOrWebsite: Em.computed.or('user.location', 'user.website_name'),
-
- @computed('user.name')
- nameFirst(name) {
- return !this.get('siteSettings.prioritize_username_in_ux') && name && name.trim().length > 0;
- },
-
- @computed('user.user_fields.@each.value')
- publicUserFields() {
- const siteUserFields = this.site.get('user_fields');
- if (!Ember.isEmpty(siteUserFields)) {
- const userFields = this.get('user.user_fields');
- return siteUserFields.filterProperty('show_on_user_card', true).sortBy('position').map(field => {
- Ember.set(field, 'dasherized_name', field.get('name').dasherize());
- const value = userFields ? userFields[field.get('id')] : null;
- return Ember.isEmpty(value) ? null : Ember.Object.create({ value, field });
- }).compact();
- }
- },
-
- @computed("user.trust_level")
- removeNoFollow(trustLevel) {
- return trustLevel > 2 && !this.siteSettings.tl3_links_no_follow;
- },
-
- moreBadgesCount: function() {
- return this.get('user.badge_count') - this.get('user.featured_user_badges.length');
- }.property('user.badge_count', 'user.featured_user_badges.[]'),
-
- hasCardBadgeImage: function() {
- const img = this.get('user.card_badge.image');
- return img && img.indexOf('fa-') !== 0;
- }.property('user.card_badge.image'),
-
- show(username, postId, target) {
- // XSS protection (should be encapsulated)
- username = username.toString().replace(/[^A-Za-z0-9_\.\-]/g, "");
-
- // No user card for anon
- if (this.siteSettings.hide_user_profiles_from_public && !this.currentUser) {
- return;
- }
-
- // Don't show on mobile
- if (this.site.mobileView) {
- const url = "/users/" + username;
- DiscourseURL.routeTo(url);
- return;
- }
-
- const currentUsername = this.get('username'),
- wasVisible = this.get('visible'),
- previousTarget = this.get('cardTarget'),
- post = this.get('viewingTopic') && postId ? this.get('postStream').findLoadedPost(postId) : null;
-
- if (username === currentUsername && this.get('userLoading') === username) {
- // debounce
- return;
- }
-
- if (wasVisible) {
- this.close();
- if (target === previousTarget) {
- return; // Same target, close it without loading the new user card
- }
- }
-
- this.setProperties({ username, userLoading: username, cardTarget: target, post });
-
- const args = { stats: false };
- args.include_post_count_for = this.get('controllers.topic.model.id');
- args.skip_track_visit = true;
-
- return Discourse.User.findByUsername(username, args).then((user) => {
- if (user.topic_post_count) {
- this.set('topicPostCount', user.topic_post_count[args.include_post_count_for]);
- }
- this.setProperties({ user, avatar: user, visible: true });
- }).catch((error) => {
- this.close();
- throw error;
- }).finally(() => {
- this.set('userLoading', null);
- });
- },
-
- close() {
- this.setProperties({
- visible: false,
- user: null,
- username: null,
- avatar: null,
- userLoading: null,
- cardTarget: null,
- post: null,
- topicPostCount: null
- });
- },
+ topic: Ember.inject.controller(),
+ application: Ember.inject.controller(),
actions: {
togglePosts(user) {
- const postStream = this.get('postStream');
- postStream.toggleParticipant(user.get('username'));
- this.close();
+ const topicController = this.get('topic');
+ topicController.send('toggleParticipant', user);
},
- cancelFilter() {
- const postStream = this.get('postStream');
- postStream.cancelFilter();
- postStream.refresh();
- this.close();
- },
-
- showUser() {
- this.transitionToRoute('user', this.get('user'));
- this.close();
+ showUser(user) {
+ this.transitionToRoute('user', user);
}
}
-
});
diff --git a/app/assets/javascripts/discourse/controllers/user-invited-show.js.es6 b/app/assets/javascripts/discourse/controllers/user-invited-show.js.es6
index 15d71343589..78c786847ec 100644
--- a/app/assets/javascripts/discourse/controllers/user-invited-show.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-invited-show.js.es6
@@ -18,8 +18,6 @@ export default Ember.Controller.extend({
this.set('searchTerm', '');
},
- uploadText: function() { return I18n.t("user.invited.bulk_invite.text"); }.property(),
-
/**
Observe the search term box with a debouncer and change the results.
diff --git a/app/assets/javascripts/discourse/controllers/user-notifications.js.es6 b/app/assets/javascripts/discourse/controllers/user-notifications.js.es6
index c185d2c29a5..44b25f1043c 100644
--- a/app/assets/javascripts/discourse/controllers/user-notifications.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-notifications.js.es6
@@ -1,12 +1,12 @@
import { ajax } from 'discourse/lib/ajax';
import { default as computed, observes } from 'ember-addons/ember-computed-decorators';
-export default Ember.ArrayController.extend({
- needs: ['application'],
+export default Ember.Controller.extend({
+ application: Ember.inject.controller(),
@observes('model.canLoadMore')
_showFooter() {
- this.set("controllers.application.showFooter", !this.get("model.canLoadMore"));
+ this.set("application.showFooter", !this.get("model.canLoadMore"));
},
@computed('model.content.length')
@@ -16,11 +16,9 @@ export default Ember.ArrayController.extend({
@computed('model.content.@each.read')
allNotificationsRead() {
- return !this.get('model.content').some((notification) => !notification.get('read'));
+ return !this.get('model.content').some(notification => !notification.get('read'));
},
- currentPath: Em.computed.alias('controllers.application.currentPath'),
-
actions: {
resetNew() {
ajax('/notifications/mark-read', { method: 'PUT' }).then(() => {
diff --git a/app/assets/javascripts/discourse/controllers/user-posts.js.es6 b/app/assets/javascripts/discourse/controllers/user-posts.js.es6
index e06143db481..25c730d97ad 100644
--- a/app/assets/javascripts/discourse/controllers/user-posts.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-posts.js.es6
@@ -1,7 +1,7 @@
export default Ember.Controller.extend({
- needs: ["application"],
+ application: Ember.inject.controller(),
_showFooter: function() {
- this.set("controllers.application.showFooter", !this.get("model.canLoadMore"));
+ this.set("application.showFooter", !this.get("model.canLoadMore"));
}.observes("model.canLoadMore")
});
diff --git a/app/assets/javascripts/discourse/controllers/user-private-messages.js.es6 b/app/assets/javascripts/discourse/controllers/user-private-messages.js.es6
index 18f010adccd..bb79db55d37 100644
--- a/app/assets/javascripts/discourse/controllers/user-private-messages.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-private-messages.js.es6
@@ -2,18 +2,21 @@ import computed from 'ember-addons/ember-computed-decorators';
import Topic from 'discourse/models/topic';
export default Ember.Controller.extend({
- needs: ["application", "user-topics-list", "user"],
+ application: Ember.inject.controller(),
+ userTopicsList: Ember.inject.controller('user-topics-list'),
+ user: Ember.inject.controller(),
+
pmView: false,
- viewingSelf: Em.computed.alias('controllers.user.viewingSelf'),
+ viewingSelf: Em.computed.alias('user.viewingSelf'),
isGroup: Em.computed.equal('pmView', 'groups'),
- currentPath: Em.computed.alias('controllers.application.currentPath'),
- selected: Em.computed.alias('controllers.user-topics-list.selected'),
- bulkSelectEnabled: Em.computed.alias('controllers.user-topics-list.bulkSelectEnabled'),
+ currentPath: Em.computed.alias('application.currentPath'),
+ selected: Em.computed.alias('userTopicsList.selected'),
+ bulkSelectEnabled: Em.computed.alias('userTopicsList.bulkSelectEnabled'),
showNewPM: function(){
- return this.get('controllers.user.viewingSelf') &&
+ return this.get('user.viewingSelf') &&
Discourse.User.currentProp('can_send_private_messages');
- }.property('controllers.user.viewingSelf'),
+ }.property('user.viewingSelf'),
@computed('selected.[]', 'bulkSelectEnabled')
hasSelection(selected, bulkSelectEnabled){
@@ -39,7 +42,7 @@ export default Ember.Controller.extend({
}
Topic.bulkOperation(selected,params).then(() => {
- const model = this.get('controllers.user-topics-list.model');
+ const model = this.get('userTopicsList.model');
const topics = model.get('topics');
topics.removeObjects(selected);
selected.clear();
diff --git a/app/assets/javascripts/discourse/controllers/user-summary.js.es6 b/app/assets/javascripts/discourse/controllers/user-summary.js.es6
index d41962d96ca..c40014854cb 100644
--- a/app/assets/javascripts/discourse/controllers/user-summary.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-summary.js.es6
@@ -6,8 +6,8 @@ const MAX_SUMMARY_RESULTS = 6;
const MAX_BADGES = 6;
export default Ember.Controller.extend({
- needs: ['user'],
- user: Ember.computed.alias('controllers.user.model'),
+ userController: Ember.inject.controller('user'),
+ user: Ember.computed.alias('userController.model'),
@computed("model.topics.length")
moreTopics(topicsLength) { return topicsLength >= MAX_SUMMARY_RESULTS; },
diff --git a/app/assets/javascripts/discourse/controllers/user-topics-list.js.es6 b/app/assets/javascripts/discourse/controllers/user-topics-list.js.es6
index e4d428a4f90..8e150fd2890 100644
--- a/app/assets/javascripts/discourse/controllers/user-topics-list.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-topics-list.js.es6
@@ -1,11 +1,12 @@
// Lists of topics on a user's page.
export default Ember.Controller.extend({
- needs: ["application", "user"],
+ application: Ember.inject.controller(),
+
hideCategory: false,
showPosters: false,
_showFooter: function() {
- this.set("controllers.application.showFooter", !this.get("model.canLoadMore"));
+ this.set("application.showFooter", !this.get("model.canLoadMore"));
}.observes("model.canLoadMore"),
actions: {
diff --git a/app/assets/javascripts/discourse/controllers/user.js.es6 b/app/assets/javascripts/discourse/controllers/user.js.es6
index b5151f1b33c..f12612b45c8 100644
--- a/app/assets/javascripts/discourse/controllers/user.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user.js.es6
@@ -6,19 +6,30 @@ import User from 'discourse/models/user';
export default Ember.Controller.extend(CanCheckEmails, {
indexStream: false,
userActionType: null,
- needs: ['application','user-notifications', 'user-topics-list'],
- currentPath: Em.computed.alias('controllers.application.currentPath'),
+ application: Ember.inject.controller(),
+ userNotifications: Ember.inject.controller('user-notifications'),
+ currentPath: Ember.computed.alias('application.currentPath'),
@computed("content.username")
viewingSelf(username) {
return username === User.currentProp('username');
},
+ @computed('model.profileBackground')
+ hasProfileBackground(background) {
+ return !Ember.isEmpty(background.toString());
+ },
+
@computed('indexStream', 'viewingSelf', 'forceExpand')
collapsedInfo(indexStream, viewingSelf, forceExpand){
return (!indexStream || viewingSelf) && !forceExpand;
},
+ @computed('model.isSuspended', 'currentUser.staff')
+ isNotSuspendedOrIsStaff(isSuspended, isStaff) {
+ return !isSuspended || isStaff;
+ },
+
linkWebsite: Em.computed.not('model.isBasic'),
@computed("model.trust_level")
@@ -75,8 +86,8 @@ export default Ember.Controller.extend(CanCheckEmails, {
const siteUserFields = this.site.get('user_fields');
if (!Ember.isEmpty(siteUserFields)) {
const userFields = this.get('model.user_fields');
- return siteUserFields.filterProperty('show_on_profile', true).sortBy('position').map(field => {
- field.dasherized_name = field.get('name').dasherize();
+ return siteUserFields.filterBy('show_on_profile', true).sortBy('position').map(field => {
+ Ember.set(field, 'dasherized_name', field.get('name').dasherize());
const value = userFields ? userFields[field.get('id').toString()] : null;
return Ember.isEmpty(value) ? null : Ember.Object.create({ value, field });
}).compact();
diff --git a/app/assets/javascripts/discourse/controllers/users.js.es6 b/app/assets/javascripts/discourse/controllers/users.js.es6
index 8ad3eabcba5..f5bb1963025 100644
--- a/app/assets/javascripts/discourse/controllers/users.js.es6
+++ b/app/assets/javascripts/discourse/controllers/users.js.es6
@@ -1,7 +1,7 @@
import debounce from 'discourse/lib/debounce';
export default Ember.Controller.extend({
- needs: ["application"],
+ application: Ember.inject.controller(),
queryParams: ["period", "order", "asc", "name"],
period: "weekly",
order: "likes_received",
@@ -15,7 +15,7 @@ export default Ember.Controller.extend({
}, 500).observes("nameInput"),
_showFooter: function() {
- this.set("controllers.application.showFooter", !this.get("model.canLoadMore"));
+ this.set("application.showFooter", !this.get("model.canLoadMore"));
}.observes("model.canLoadMore"),
actions: {
diff --git a/app/assets/javascripts/discourse/ember/resolver.js.es6 b/app/assets/javascripts/discourse/ember/resolver.js.es6
deleted file mode 100644
index 99ecb42d2a9..00000000000
--- a/app/assets/javascripts/discourse/ember/resolver.js.es6
+++ /dev/null
@@ -1,198 +0,0 @@
-/* global requirejs, require */
-
-var classify = Ember.String.classify;
-var get = Ember.get;
-
-var LOADING_WHITELIST = ['badges', 'userActivity', 'userPrivateMessages', 'admin', 'adminFlags',
- 'user', 'preferences', 'adminEmail', 'adminUsersList'];
-var _dummyRoute;
-var _loadingView;
-
-function loadingResolver(cb) {
- return function(parsedName) {
- var fullNameWithoutType = parsedName.fullNameWithoutType;
-
- if (fullNameWithoutType.indexOf('Loading') >= 0) {
- fullNameWithoutType = fullNameWithoutType.replace('Loading', '');
- if (LOADING_WHITELIST.indexOf(fullNameWithoutType) !== -1) {
- return cb(fullNameWithoutType);
- }
- }
- };
-}
-
-function parseName(fullName) {
- const nameParts = fullName.split(":"),
- type = nameParts[0], fullNameWithoutType = nameParts[1],
- name = fullNameWithoutType,
- namespace = get(this, 'namespace'),
- root = namespace;
-
- return {
- fullName: fullName,
- type: type,
- fullNameWithoutType: fullNameWithoutType,
- name: name,
- root: root,
- resolveMethodName: "resolve" + classify(type)
- };
-}
-
-export default Ember.DefaultResolver.extend({
- parseName: parseName,
-
- normalize(fullName) {
- var split = fullName.split(':');
- if (split.length > 1) {
- var discourseBase = 'discourse/' + split[0] + 's/';
- var adminBase = 'admin/' + split[0] + 's/';
-
- // Allow render 'admin/templates/xyz' too
- split[1] = split[1].replace('.templates', '').replace('/templates', '');
-
- // Try slashes
- var dashed = Ember.String.dasherize(split[1].replace(/\./g, '/'));
- if (requirejs.entries[discourseBase + dashed] || requirejs.entries[adminBase + dashed]) {
- return split[0] + ":" + dashed;
- }
-
- // Try with dashes instead of slashes
- dashed = Ember.String.dasherize(split[1].replace(/\./g, '-'));
- if (requirejs.entries[discourseBase + dashed] || requirejs.entries[adminBase + dashed]) {
- return split[0] + ":" + dashed;
- }
- }
- return this._super(fullName);
- },
-
- customResolve(parsedName) {
- // If we end with the name we want, use it. This allows us to define components within plugins.
- const suffix = parsedName.type + 's/' + parsedName.fullNameWithoutType,
- dashed = Ember.String.dasherize(suffix),
- moduleName = Object.keys(requirejs.entries).find(function(e) {
- return (e.indexOf(suffix, e.length - suffix.length) !== -1) ||
- (e.indexOf(dashed, e.length - dashed.length) !== -1);
- });
-
- var module;
- if (moduleName) {
- module = require(moduleName, null, null, true /* force sync */);
- if (module && module['default']) { module = module['default']; }
- }
- return module;
- },
-
- resolveWidget(parsedName) {
- return this.customResolve(parsedName) || this._super(parsedName);
- },
-
- resolveAdapter(parsedName) {
- return this.customResolve(parsedName) || this._super(parsedName);
- },
-
- resolveModel(parsedName) {
- return this.customResolve(parsedName) || this._super(parsedName);
- },
-
- resolveView(parsedName) {
- return this.findLoadingView(parsedName) || this.customResolve(parsedName) || this._super(parsedName);
- },
-
- resolveHelper(parsedName) {
- return this.customResolve(parsedName) || this._super(parsedName);
- },
-
- resolveController(parsedName) {
- return this.customResolve(parsedName) || this._super(parsedName);
- },
-
- resolveComponent(parsedName) {
- return this.customResolve(parsedName) || this._super(parsedName);
- },
-
- resolveRoute(parsedName) {
- return this.findLoadingRoute(parsedName) || this.customResolve(parsedName) || this._super(parsedName);
- },
-
- resolveTemplate(parsedName) {
- return this.findPluginTemplate(parsedName) ||
- this.findMobileTemplate(parsedName) ||
- this.findTemplate(parsedName) ||
- Ember.TEMPLATES.not_found;
- },
-
- findLoadingRoute: loadingResolver(function() {
- _dummyRoute = _dummyRoute || Ember.Route.extend();
- return _dummyRoute;
- }),
-
- findLoadingView: loadingResolver(function() {
- if (!_loadingView) {
- _loadingView = require('discourse/views/loading', null, null, true /* force sync */);
- if (_loadingView && _loadingView['default']) { _loadingView = _loadingView['default']; }
- }
- return _loadingView;
- }),
-
- findPluginTemplate(parsedName) {
- var pluginParsedName = this.parseName(parsedName.fullName.replace("template:", "template:javascripts/"));
- return this.findTemplate(pluginParsedName);
- },
-
- findMobileTemplate(parsedName) {
- if (this.mobileView) {
- var mobileParsedName = this.parseName(parsedName.fullName.replace("template:", "template:mobile/"));
- return this.findTemplate(mobileParsedName);
- }
- },
-
- findTemplate(parsedName) {
- const withoutType = parsedName.fullNameWithoutType,
- slashedType = withoutType.replace(/\./g, '/'),
- decamelized = withoutType.decamelize(),
- dashed = decamelized.replace(/\./g, '-').replace(/\_/g, '-'),
- templates = Ember.TEMPLATES;
-
- return this._super(parsedName) ||
- templates[slashedType] ||
- templates[withoutType] ||
- templates[dashed] ||
- templates[decamelized.replace(/\./, '/')] ||
- templates[decamelized.replace(/\_/, '/')] ||
- this.findAdminTemplate(parsedName) ||
- this.findUnderscoredTemplate(parsedName);
- },
-
- findUnderscoredTemplate(parsedName) {
- var decamelized = parsedName.fullNameWithoutType.decamelize();
- var underscored = decamelized.replace(/\-/g, "_");
- return Ember.TEMPLATES[underscored];
- },
-
- // Try to find a template within a special admin namespace, e.g. adminEmail => admin/templates/email
- // (similar to how discourse lays out templates)
- findAdminTemplate(parsedName) {
- var decamelized = parsedName.fullNameWithoutType.decamelize();
-
- if (decamelized.indexOf('components') === 0) {
- const compTemplate = Ember.TEMPLATES['admin/templates/' + decamelized];
- if (compTemplate) { return compTemplate; }
- }
-
- if (decamelized === "javascripts/admin") {
- return Ember.TEMPLATES['admin/templates/admin'];
- }
-
- if (decamelized.indexOf('admin') === 0 || decamelized.indexOf('javascripts/admin') === 0) {
- decamelized = decamelized.replace(/^admin\_/, 'admin/templates/');
- decamelized = decamelized.replace(/^admin\./, 'admin/templates/');
- decamelized = decamelized.replace(/\./g, '_');
-
- const dashed = decamelized.replace(/_/g, '-');
- return Ember.TEMPLATES[decamelized] ||
- Ember.TEMPLATES[dashed] ||
- Ember.TEMPLATES[dashed.replace('admin-', 'admin/')];
- }
- }
-
-});
diff --git a/app/assets/javascripts/discourse/helpers/application.js.es6 b/app/assets/javascripts/discourse/helpers/application.js.es6
index dda9e4e7b99..05306c0e62f 100644
--- a/app/assets/javascripts/discourse/helpers/application.js.es6
+++ b/app/assets/javascripts/discourse/helpers/application.js.es6
@@ -1,4 +1,4 @@
-import { registerUnbound } from 'discourse/lib/helpers';
+import { registerUnbound } from 'discourse-common/lib/helpers';
import { longDate, autoUpdatingRelativeAge, number } from 'discourse/lib/formatter';
const safe = Handlebars.SafeString;
@@ -20,11 +20,13 @@ registerUnbound('number', (orig, params) => {
if (params['class']) {
classNames += ' ' + params['class'];
}
+
let result = "";
diff --git a/app/assets/javascripts/discourse/helpers/as-hash.js.es6 b/app/assets/javascripts/discourse/helpers/as-hash.js.es6
deleted file mode 100644
index c5c67a64e02..00000000000
--- a/app/assets/javascripts/discourse/helpers/as-hash.js.es6
+++ /dev/null
@@ -1,8 +0,0 @@
-// Note: Later versions of ember include `hash`
-export default function hashHelper(params) {
- const hash = {};
- Object.keys(params.hash).forEach(k => {
- hash[k] = params.data.view.getStream(params.hash[k]).value();
- });
- return hash;
-}
diff --git a/app/assets/javascripts/discourse/helpers/border-color.js.es6 b/app/assets/javascripts/discourse/helpers/border-color.js.es6
index 7d6d2286760..4c327a8190e 100644
--- a/app/assets/javascripts/discourse/helpers/border-color.js.es6
+++ b/app/assets/javascripts/discourse/helpers/border-color.js.es6
@@ -1,3 +1,3 @@
-import { htmlHelper } from 'discourse/lib/helpers';
+import { htmlHelper } from 'discourse-common/lib/helpers';
export default htmlHelper(color => `border-color: #${color}`);
diff --git a/app/assets/javascripts/discourse/helpers/bound-avatar-template.js.es6 b/app/assets/javascripts/discourse/helpers/bound-avatar-template.js.es6
index 31f5611c755..5682cd2fbdc 100644
--- a/app/assets/javascripts/discourse/helpers/bound-avatar-template.js.es6
+++ b/app/assets/javascripts/discourse/helpers/bound-avatar-template.js.es6
@@ -1,4 +1,4 @@
-import { htmlHelper } from 'discourse/lib/helpers';
+import { htmlHelper } from 'discourse-common/lib/helpers';
import { avatarImg } from 'discourse/lib/utilities';
export default htmlHelper((avatarTemplate, size) => avatarImg({ size, avatarTemplate }));
diff --git a/app/assets/javascripts/discourse/helpers/bound-avatar.js.es6 b/app/assets/javascripts/discourse/helpers/bound-avatar.js.es6
index 79639c8a16a..2833f8cefb1 100644
--- a/app/assets/javascripts/discourse/helpers/bound-avatar.js.es6
+++ b/app/assets/javascripts/discourse/helpers/bound-avatar.js.es6
@@ -1,4 +1,4 @@
-import { htmlHelper } from 'discourse/lib/helpers';
+import { htmlHelper } from 'discourse-common/lib/helpers';
import { avatarImg } from 'discourse/lib/utilities';
export default htmlHelper((user, size) => {
diff --git a/app/assets/javascripts/discourse/helpers/bound-category-link.js.es6 b/app/assets/javascripts/discourse/helpers/bound-category-link.js.es6
index 5d215405b26..a08d97d8876 100644
--- a/app/assets/javascripts/discourse/helpers/bound-category-link.js.es6
+++ b/app/assets/javascripts/discourse/helpers/bound-category-link.js.es6
@@ -1,4 +1,4 @@
-import { htmlHelper } from 'discourse/lib/helpers';
+import { htmlHelper } from 'discourse-common/lib/helpers';
import { categoryLinkHTML } from 'discourse/helpers/category-link';
export default htmlHelper(categoryLinkHTML);
diff --git a/app/assets/javascripts/discourse/helpers/bound-date.js.es6 b/app/assets/javascripts/discourse/helpers/bound-date.js.es6
index b4f75cffc4c..beab3e1730a 100644
--- a/app/assets/javascripts/discourse/helpers/bound-date.js.es6
+++ b/app/assets/javascripts/discourse/helpers/bound-date.js.es6
@@ -1,4 +1,4 @@
import { autoUpdatingRelativeAge } from 'discourse/lib/formatter';
-import { htmlHelper } from 'discourse/lib/helpers';
+import { htmlHelper } from 'discourse-common/lib/helpers';
export default htmlHelper(dt => autoUpdatingRelativeAge(new Date(dt), {format: 'medium', title: true }));
diff --git a/app/assets/javascripts/discourse/helpers/capitalize-string.js.es6 b/app/assets/javascripts/discourse/helpers/capitalize-string.js.es6
index 3914e405bd8..976a9ecd342 100644
--- a/app/assets/javascripts/discourse/helpers/capitalize-string.js.es6
+++ b/app/assets/javascripts/discourse/helpers/capitalize-string.js.es6
@@ -1,3 +1,3 @@
-import { htmlHelper } from 'discourse/lib/helpers';
+import { htmlHelper } from 'discourse-common/lib/helpers';
export default htmlHelper(str => str[0].toUpperCase() + str.slice(1));
diff --git a/app/assets/javascripts/discourse/helpers/category-badge.js.es6 b/app/assets/javascripts/discourse/helpers/category-badge.js.es6
index c716537a6d3..41aad35a597 100644
--- a/app/assets/javascripts/discourse/helpers/category-badge.js.es6
+++ b/app/assets/javascripts/discourse/helpers/category-badge.js.es6
@@ -1,7 +1,10 @@
import { categoryLinkHTML } from 'discourse/helpers/category-link';
-import { registerUnbound } from 'discourse/lib/helpers';
+import { registerUnbound } from 'discourse-common/lib/helpers';
registerUnbound('category-badge', function(cat, options) {
- options.link = false;
- return categoryLinkHTML(cat, options);
+ return categoryLinkHTML(cat, {
+ hideParent: options.hideParent,
+ allowUncategorized: options.allowUncategorized,
+ link: false
+ });
});
diff --git a/app/assets/javascripts/discourse/helpers/category-link.js.es6 b/app/assets/javascripts/discourse/helpers/category-link.js.es6
index bc184157485..618eca3211a 100644
--- a/app/assets/javascripts/discourse/helpers/category-link.js.es6
+++ b/app/assets/javascripts/discourse/helpers/category-link.js.es6
@@ -1,5 +1,5 @@
-import { registerUnbound } from 'discourse/lib/helpers';
-import { iconHTML } from 'discourse/helpers/fa-icon';
+import { registerUnbound } from 'discourse-common/lib/helpers';
+import { iconHTML } from 'discourse-common/helpers/fa-icon';
var get = Em.get,
escapeExpression = Handlebars.Utils.escapeExpression;
diff --git a/app/assets/javascripts/discourse/helpers/cold-age-class.js.es6 b/app/assets/javascripts/discourse/helpers/cold-age-class.js.es6
index 54c23bfb63b..5042a11120f 100644
--- a/app/assets/javascripts/discourse/helpers/cold-age-class.js.es6
+++ b/app/assets/javascripts/discourse/helpers/cold-age-class.js.es6
@@ -1,4 +1,4 @@
-import { registerUnbound } from 'discourse/lib/helpers';
+import { registerUnbound } from 'discourse-common/lib/helpers';
function daysSinceEpoch(dt) {
// 1000 * 60 * 60 * 24 = days since epoch
diff --git a/app/assets/javascripts/discourse/helpers/cook-text.js.es6 b/app/assets/javascripts/discourse/helpers/cook-text.js.es6
index ba214983a22..7864f01af80 100644
--- a/app/assets/javascripts/discourse/helpers/cook-text.js.es6
+++ b/app/assets/javascripts/discourse/helpers/cook-text.js.es6
@@ -1,4 +1,4 @@
import { cook } from 'discourse/lib/text';
-import { registerUnbound } from 'discourse/lib/helpers';
+import { registerUnbound } from 'discourse-common/lib/helpers';
registerUnbound('cook-text', cook);
diff --git a/app/assets/javascripts/discourse/helpers/custom-html.js.es6 b/app/assets/javascripts/discourse/helpers/custom-html.js.es6
index 8dc3be9c380..1fbc94eb832 100644
--- a/app/assets/javascripts/discourse/helpers/custom-html.js.es6
+++ b/app/assets/javascripts/discourse/helpers/custom-html.js.es6
@@ -1,7 +1,6 @@
-import { registerHelper } from 'discourse/lib/helpers';
import PreloadStore from 'preload-store';
-const _customizations = {};
+let _customizations = {};
export function getCustomHTML(key) {
const c = _customizations[key];
@@ -15,20 +14,11 @@ export function getCustomHTML(key) {
}
}
+export function clearHTMLCache() {
+ _customizations = {};
+}
+
// Set a fragment of HTML by key. It can then be looked up with `getCustomHTML(key)`.
export function setCustomHTML(key, html) {
_customizations[key] = html;
}
-
-registerHelper('custom-html', function(params, hash, options, env) {
- const name = params[0];
- const html = getCustomHTML(name);
- if (html) { return html; }
-
- const contextString = params[1];
- const target = (env || contextString);
- const container = target.container || target.data.view.container;
- if (container.lookup('template:' + name)) {
- return env.helpers.partial.helperFunction.apply(this, arguments);
- }
-});
diff --git a/app/assets/javascripts/discourse/helpers/dash-if-empty.js.es6 b/app/assets/javascripts/discourse/helpers/dash-if-empty.js.es6
index fd694261d37..4b1553735c8 100644
--- a/app/assets/javascripts/discourse/helpers/dash-if-empty.js.es6
+++ b/app/assets/javascripts/discourse/helpers/dash-if-empty.js.es6
@@ -1,3 +1,3 @@
-import { htmlHelper } from 'discourse/lib/helpers';
+import { htmlHelper } from 'discourse-common/lib/helpers';
export default htmlHelper(str => Ember.isEmpty(str) ? '—' : str);
diff --git a/app/assets/javascripts/discourse/helpers/discouse-tag.js.es6 b/app/assets/javascripts/discourse/helpers/discourse-tag.js.es6
similarity index 74%
rename from app/assets/javascripts/discourse/helpers/discouse-tag.js.es6
rename to app/assets/javascripts/discourse/helpers/discourse-tag.js.es6
index 1221da2417e..8c6cbf156e5 100644
--- a/app/assets/javascripts/discourse/helpers/discouse-tag.js.es6
+++ b/app/assets/javascripts/discourse/helpers/discourse-tag.js.es6
@@ -1,4 +1,4 @@
-import { registerUnbound } from 'discourse/lib/helpers';
+import { registerUnbound } from 'discourse-common/lib/helpers';
import renderTag from 'discourse/lib/render-tag';
export default registerUnbound('discourse-tag', function(name, params) {
diff --git a/app/assets/javascripts/discourse/helpers/fa-icon-node.js.es6 b/app/assets/javascripts/discourse/helpers/fa-icon-node.js.es6
new file mode 100644
index 00000000000..84f15420258
--- /dev/null
+++ b/app/assets/javascripts/discourse/helpers/fa-icon-node.js.es6
@@ -0,0 +1,20 @@
+import { h } from 'virtual-dom';
+import { iconClasses } from 'discourse-common/helpers/fa-icon';
+
+export function iconNode(icon, params) {
+ params = params || {};
+
+ const properties = {
+ className: iconClasses(icon, params),
+ attributes: { "aria-hidden": true }
+ };
+
+ if (params.title) { properties.attributes.title = params.title; }
+
+ if (params.label) {
+ return h('i', properties, h('span.sr-only', I18n.t(params.label)));
+ } else {
+ return h('i', properties);
+ }
+}
+
diff --git a/app/assets/javascripts/discourse/helpers/format-age.js.es6 b/app/assets/javascripts/discourse/helpers/format-age.js.es6
index 69247fb5f53..75119d0c5f2 100644
--- a/app/assets/javascripts/discourse/helpers/format-age.js.es6
+++ b/app/assets/javascripts/discourse/helpers/format-age.js.es6
@@ -1,5 +1,5 @@
import { autoUpdatingRelativeAge } from 'discourse/lib/formatter';
-import { registerUnbound } from 'discourse/lib/helpers';
+import { registerUnbound } from 'discourse-common/lib/helpers';
registerUnbound('format-age', function(dt) {
dt = new Date(dt);
diff --git a/app/assets/javascripts/discourse/helpers/format-date.js.es6 b/app/assets/javascripts/discourse/helpers/format-date.js.es6
index feb207c2a5f..84602bebc82 100644
--- a/app/assets/javascripts/discourse/helpers/format-date.js.es6
+++ b/app/assets/javascripts/discourse/helpers/format-date.js.es6
@@ -1,4 +1,4 @@
-import { registerUnbound } from 'discourse/lib/helpers';
+import { registerUnbound } from 'discourse-common/lib/helpers';
import { autoUpdatingRelativeAge } from 'discourse/lib/formatter';
/**
diff --git a/app/assets/javascripts/discourse/helpers/icon-or-image.js.es6 b/app/assets/javascripts/discourse/helpers/icon-or-image.js.es6
index 5f4c6cbce8b..f673bb8cda3 100644
--- a/app/assets/javascripts/discourse/helpers/icon-or-image.js.es6
+++ b/app/assets/javascripts/discourse/helpers/icon-or-image.js.es6
@@ -1,4 +1,4 @@
-import { htmlHelper } from 'discourse/lib/helpers';
+import { htmlHelper } from 'discourse-common/lib/helpers';
export default htmlHelper(function(str) {
if (Ember.isEmpty(str)) { return ""; }
diff --git a/app/assets/javascripts/discourse/helpers/inline-date.js.es6 b/app/assets/javascripts/discourse/helpers/inline-date.js.es6
index 874434fd3c9..f483802ee09 100644
--- a/app/assets/javascripts/discourse/helpers/inline-date.js.es6
+++ b/app/assets/javascripts/discourse/helpers/inline-date.js.es6
@@ -1,6 +1,8 @@
import { relativeAge } from 'discourse/lib/formatter';
+import { registerHelper } from 'discourse-common/lib/helpers';
-export default function(dt, params) {
- dt = params.data.view.getStream(dt).value();
+registerHelper('inline-date', function([dt]) {
+ // TODO: Remove this in 1.13 or greater
+ if (dt.value) { dt = dt.value(); }
return relativeAge(new Date(dt));
-}
+});
diff --git a/app/assets/javascripts/discourse/helpers/loading-spinner.es6 b/app/assets/javascripts/discourse/helpers/loading-spinner.es6
index 05dfd735bd8..fda8fe6beb1 100644
--- a/app/assets/javascripts/discourse/helpers/loading-spinner.es6
+++ b/app/assets/javascripts/discourse/helpers/loading-spinner.es6
@@ -1,4 +1,4 @@
-import { htmlHelper } from 'discourse/lib/helpers';
+import { htmlHelper } from 'discourse-common/lib/helpers';
function renderSpinner(cssClass) {
var html = " maxLength){
- return usernames.slice(0, maxLength).join(", ") + ", +" + (usernames.length - maxLength);
- } else {
- return usernames.join(", ");
- }
-});
diff --git a/app/assets/javascripts/discourse/helpers/period-title.js.es6 b/app/assets/javascripts/discourse/helpers/period-title.js.es6
index ee18503b062..37af602c29d 100644
--- a/app/assets/javascripts/discourse/helpers/period-title.js.es6
+++ b/app/assets/javascripts/discourse/helpers/period-title.js.es6
@@ -1,4 +1,4 @@
-import { htmlHelper } from 'discourse/lib/helpers';
+import { htmlHelper } from 'discourse-common/lib/helpers';
const TITLE_SUBS = {
all: 'all_time',
diff --git a/app/assets/javascripts/discourse/helpers/plugin-outlet.js.es6 b/app/assets/javascripts/discourse/helpers/plugin-outlet.js.es6
deleted file mode 100644
index 3b47ac8cf4c..00000000000
--- a/app/assets/javascripts/discourse/helpers/plugin-outlet.js.es6
+++ /dev/null
@@ -1,188 +0,0 @@
-/**
- A plugin outlet is an extension point for templates where other templates can
- be inserted by plugins.
-
- ## Usage
-
- If your handlebars template has:
-
- ```handlebars
- {{plugin-outlet "evil-trout"}}
- ```
-
- Then any handlebars files you create in the `connectors/evil-trout` directory
- will automatically be appended. For example:
-
- plugins/hello/assets/javascripts/discourse/templates/connectors/evil-trout/hello.hbs
-
- With the contents:
-
- ```handlebars
- Hello World
- ```
-
- Will insert Hello World at that point in the template.
-
- Optionally you can also define a view class for the outlet as:
-
- plugins/hello/assets/javascripts/discourse/views/connectors/evil-trout/hello.js.es6
-
- And it will be wired up automatically.
-
- ## The block form
-
- If you use the block form of the outlet, its contents will be displayed
- if no connectors are found. Example:
-
- ```handlebars
- {{#plugin-outlet "hello-world"}}
- Nobody says hello :'(
- {{/plugin-outlet}}
- ```
-
- ## Disabling
-
- If a plugin returns a disabled status, the outlets will not be wired up for it.
- The list of disabled plugins is returned via the `Site` singleton.
-
-**/
-import { registerHelper } from 'discourse/lib/helpers';
-
-let _connectorCache, _rawCache;
-
-function findOutlets(collection, callback) {
-
- const disabledPlugins = Discourse.Site.currentProp('disabled_plugins') || [];
-
- Object.keys(collection).forEach(function(res) {
- if (res.indexOf("/connectors/") !== -1) {
- // Skip any disabled plugins
- for (let i=0; i 1) ? Ember.ContainerView : childViews[0];
-
- const newHash = $.extend({}, viewInjections(env.data.view.container));
- if (hash.tagName) { newHash.tagName = hash.tagName; }
-
- // we don't need the default template since we have a connector
- delete options.fn;
- delete options.template;
- env.helpers.view.helperFunction.call(this, [viewClass], newHash, options, env);
-
- const cvs = env.data.view._childViews;
- if (childViews.length > 1 && cvs && cvs.length) {
- const inserted = cvs[cvs.length-1];
- if (inserted) {
- childViews.forEach(function(cv) {
- inserted.pushObject(cv.create());
- });
- }
- }
- } else if (options.isBlock) {
- const virtualView = Ember.View.extend({
- isVirtual: true,
- tagName: hash.tagName || '',
- template: options.template
- });
- env.helpers.view.helperFunction.call(this, [virtualView], hash, options, env);
- }
-});
-
-// No longer used
-export function rewire() { }
diff --git a/app/assets/javascripts/discourse/helpers/raw-plugin-outlet.js.es6 b/app/assets/javascripts/discourse/helpers/raw-plugin-outlet.js.es6
new file mode 100644
index 00000000000..aa8657464a9
--- /dev/null
+++ b/app/assets/javascripts/discourse/helpers/raw-plugin-outlet.js.es6
@@ -0,0 +1,9 @@
+import { rawConnectorsFor } from 'discourse/lib/plugin-connectors';
+
+Handlebars.registerHelper('raw-plugin-outlet', function(args) {
+ const connectors = rawConnectorsFor(args.hash.name);
+ if (connectors.length) {
+ const output = connectors.map(c => c.template({context: this}));
+ return new Handlebars.SafeString(output.join(""));
+ }
+});
diff --git a/app/assets/javascripts/discourse/helpers/raw.js.es6 b/app/assets/javascripts/discourse/helpers/raw.js.es6
index b7c89470f7b..7f3d8b247b0 100644
--- a/app/assets/javascripts/discourse/helpers/raw.js.es6
+++ b/app/assets/javascripts/discourse/helpers/raw.js.es6
@@ -1,17 +1,29 @@
-import { registerUnbound } from 'discourse/lib/helpers';
+import { registerUnbound } from 'discourse-common/lib/helpers';
+import { findRawTemplate } from 'discourse/lib/raw-templates';
-// see: https://github.com/emberjs/ember.js/issues/12634
-var missingViews = {};
+let _injections;
-function renderRaw(ctx, template, templateName, params) {
+function renderRaw(ctx, container, template, templateName, params) {
+ params = jQuery.extend({}, params);
params.parent = params.parent || ctx;
- if (!params.view && !missingViews[templateName]) {
- var viewClass = Discourse.__container__.lookupFactory('view:' + templateName);
- if (viewClass) {
- params.view = viewClass.create(params);
- } else {
- missingViews[templateName] = true;
+ if (!params.view) {
+ if (!_injections) {
+ _injections = {
+ siteSettings: container.lookup('site-settings:main'),
+ currentUser: container.lookup('currentUser:main'),
+ site: container.lookup('site:main'),
+ session: container.lookup('session:main'),
+ topicTrackingState: container.lookup('topic-tracking-state:main')
+ };
+ }
+
+ const module = `discourse/raw-views/${templateName}`;
+ if (requirejs.entries[module]) {
+ const viewClass = require(module, null, null, true);
+ if (viewClass && viewClass.default) {
+ params.view = viewClass.default.create(params, _injections);
+ }
}
}
@@ -19,10 +31,13 @@ function renderRaw(ctx, template, templateName, params) {
}
registerUnbound('raw', function(templateName, params) {
- var template = Discourse.__container__.lookup('template:' + templateName + '.raw');
+ templateName = templateName.replace('.', '/');
+
+ const container = Discourse.__container__;
+ const template = findRawTemplate(templateName);
if (!template) {
- Ember.warn('Could not find raw template: ' + templateName);
+ console.warn('Could not find raw template: ' + templateName);
return;
}
- return renderRaw(this, template, templateName, params);
+ return renderRaw(this, container, template, templateName, params);
});
diff --git a/app/assets/javascripts/discourse/helpers/i18n.js.es6 b/app/assets/javascripts/discourse/helpers/replace-emoji.js.es6
similarity index 54%
rename from app/assets/javascripts/discourse/helpers/i18n.js.es6
rename to app/assets/javascripts/discourse/helpers/replace-emoji.js.es6
index 2643d28dd9a..456c733a07a 100644
--- a/app/assets/javascripts/discourse/helpers/i18n.js.es6
+++ b/app/assets/javascripts/discourse/helpers/replace-emoji.js.es6
@@ -1,5 +1,4 @@
-import { registerUnbound } from 'discourse/lib/helpers';
+import { registerUnbound } from 'discourse-common/lib/helpers';
import { emojiUnescape } from 'discourse/lib/text';
-registerUnbound('i18n', (key, params) => I18n.t(key, params));
registerUnbound('replace-emoji', text => new Handlebars.SafeString(emojiUnescape(text)));
diff --git a/app/assets/javascripts/discourse/helpers/shorten-url.js.es6 b/app/assets/javascripts/discourse/helpers/shorten-url.js.es6
index 4862b04d78d..61afd3f5f43 100644
--- a/app/assets/javascripts/discourse/helpers/shorten-url.js.es6
+++ b/app/assets/javascripts/discourse/helpers/shorten-url.js.es6
@@ -1,4 +1,4 @@
-import { registerUnbound } from 'discourse/lib/helpers';
+import { registerUnbound } from 'discourse-common/lib/helpers';
registerUnbound('shorten-url', function(url) {
var matches = url.match(/\//g);
diff --git a/app/assets/javascripts/discourse/helpers/topic-featured-link.js.es6 b/app/assets/javascripts/discourse/helpers/topic-featured-link.js.es6
new file mode 100644
index 00000000000..686599e2b1f
--- /dev/null
+++ b/app/assets/javascripts/discourse/helpers/topic-featured-link.js.es6
@@ -0,0 +1,6 @@
+import { registerUnbound } from 'discourse-common/lib/helpers';
+import renderTopicFeaturedLink from 'discourse/lib/render-topic-featured-link';
+
+export default registerUnbound('topic-featured-link', function(topic, params) {
+ return new Handlebars.SafeString(renderTopicFeaturedLink(topic, params));
+});
diff --git a/app/assets/javascripts/discourse/helpers/topic-link.js.es6 b/app/assets/javascripts/discourse/helpers/topic-link.js.es6
index ca03e990d0c..2c1d61606f6 100644
--- a/app/assets/javascripts/discourse/helpers/topic-link.js.es6
+++ b/app/assets/javascripts/discourse/helpers/topic-link.js.es6
@@ -1,4 +1,4 @@
-import { registerUnbound } from 'discourse/lib/helpers';
+import { registerUnbound } from 'discourse-common/lib/helpers';
registerUnbound('topic-link', function(topic) {
var title = topic.get('fancyTitle');
diff --git a/app/assets/javascripts/discourse/helpers/user-avatar.js.es6 b/app/assets/javascripts/discourse/helpers/user-avatar.js.es6
index 228b90e58cc..75e60da098e 100644
--- a/app/assets/javascripts/discourse/helpers/user-avatar.js.es6
+++ b/app/assets/javascripts/discourse/helpers/user-avatar.js.es6
@@ -1,4 +1,4 @@
-import { registerUnbound } from 'discourse/lib/helpers';
+import { registerUnbound } from 'discourse-common/lib/helpers';
import { avatarImg } from 'discourse/lib/utilities';
function renderAvatar(user, options) {
@@ -11,8 +11,8 @@ function renderAvatar(user, options) {
if (!username || !avatarTemplate) { return ''; }
- let title;
- if (!options.ignoreTitle) {
+ let title = options.title;
+ if (!title && !options.ignoreTitle) {
// first try to get a title
title = Em.get(user, 'title');
// if there was no title provided
diff --git a/app/assets/javascripts/discourse/helpers/user-status.js.es6 b/app/assets/javascripts/discourse/helpers/user-status.js.es6
index bc8af5f1581..fb1a05efeed 100644
--- a/app/assets/javascripts/discourse/helpers/user-status.js.es6
+++ b/app/assets/javascripts/discourse/helpers/user-status.js.es6
@@ -1,12 +1,15 @@
-import { iconHTML } from 'discourse/helpers/fa-icon';
-import { htmlHelper } from 'discourse/lib/helpers';
+import { iconHTML } from 'discourse-common/helpers/fa-icon';
+import { htmlHelper } from 'discourse-common/lib/helpers';
import { escapeExpression } from 'discourse/lib/utilities';
export default htmlHelper((user, args) => {
if (!user) { return; }
const name = escapeExpression(user.get('name'));
- const currentUser = args.hash.currentUser;
+ let currentUser;
+ if (args && args.hash) {
+ currentUser = args.hash.currentUser;
+ }
if (currentUser && user.get('admin') && currentUser.get('staff')) {
return iconHTML('shield', { label: I18n.t('user.admin', { user: name }) });
diff --git a/app/assets/javascripts/discourse/initializers/asset-version.js.es6 b/app/assets/javascripts/discourse/initializers/asset-version.js.es6
index 6f3b3686dfa..602755937c4 100644
--- a/app/assets/javascripts/discourse/initializers/asset-version.js.es6
+++ b/app/assets/javascripts/discourse/initializers/asset-version.js.es6
@@ -12,13 +12,13 @@ export default {
Discourse.set("assetVersion", version);
if (!timeoutIsSet && Discourse.get("requiresRefresh")) {
- // since we can do this transparently for people browsing the forum
- // hold back the message a couple of hours
+ // Since we can do this transparently for people browsing the forum
+ // hold back the message 24 hours.
setTimeout(function () {
bootbox.confirm(I18n.lookup("assets_changed_confirm"), function (result) {
if (result) { document.location.reload(); }
});
- }, 1000 * 60 * 120);
+ }, 1000 * 60 * 24 * 60);
timeoutIsSet = true;
}
diff --git a/app/assets/javascripts/discourse/initializers/auto-load-modules.js.es6 b/app/assets/javascripts/discourse/initializers/auto-load-modules.js.es6
index b5bf7cc0415..4920eca574c 100644
--- a/app/assets/javascripts/discourse/initializers/auto-load-modules.js.es6
+++ b/app/assets/javascripts/discourse/initializers/auto-load-modules.js.es6
@@ -1,4 +1,6 @@
-export function autoLoadModules() {
+import { registerHelpers } from 'discourse-common/lib/helpers';
+
+export function autoLoadModules(container, registry) {
Object.keys(requirejs.entries).forEach(entry => {
if ((/\/helpers\//).test(entry)) {
require(entry, null, null, true);
@@ -7,6 +9,7 @@ export function autoLoadModules() {
require(entry, null, null, true);
}
});
+ registerHelpers(registry);
}
export default {
diff --git a/app/assets/javascripts/discourse/initializers/live-development.js.es6 b/app/assets/javascripts/discourse/initializers/live-development.js.es6
index a3c8afa51a3..f73172e154e 100644
--- a/app/assets/javascripts/discourse/initializers/live-development.js.es6
+++ b/app/assets/javascripts/discourse/initializers/live-development.js.es6
@@ -1,4 +1,3 @@
-import loadScript from 'discourse/lib/load-script';
import DiscourseURL from 'discourse/lib/url';
// Use the message bus for live reloading of components for faster development.
@@ -47,24 +46,6 @@ export default {
if (me === "refresh") {
// Refresh if necessary
document.location.reload(true);
- } else if (me.name.substr(-10) === "hbs") {
-
- // Reload handlebars
- const js = me.name.replace(".hbs", "").replace("app/assets/javascripts", "/assets");
- loadScript(js + "?hash=" + me.hash).then(function() {
- const templateName = js.replace(".js", "").replace("/assets/", "");
- return _.each(Ember.View.views, function(view) {
- if (view.get('templateName') === templateName) {
- view.set('templateName', 'empty');
- view.rerender();
- Em.run.schedule('afterRender', function() {
- view.set('templateName', templateName);
- view.rerender();
- });
- }
- });
- });
-
} else {
$('link').each(function() {
// TODO: stop bundling css in DEV please
diff --git a/app/assets/javascripts/discourse/initializers/mobile.js.es6 b/app/assets/javascripts/discourse/initializers/mobile.js.es6
index 2ac54497b2c..8c057a425fc 100644
--- a/app/assets/javascripts/discourse/initializers/mobile.js.es6
+++ b/app/assets/javascripts/discourse/initializers/mobile.js.es6
@@ -1,18 +1,18 @@
import Mobile from 'discourse/lib/mobile';
+import { setResolverOption } from 'discourse-common/resolver';
// Initializes the `Mobile` helper object.
export default {
name: 'mobile',
after: 'inject-objects',
- initialize(container, app) {
+ initialize(container) {
Mobile.init();
const site = container.lookup('site:main');
site.set('mobileView', Mobile.mobileView);
site.set('isMobileDevice', Mobile.isMobileDevice);
- // This is a bit weird but you can't seem to inject into the resolver?
- app.registry.resolver.__resolver__.mobileView = Mobile.mobileView;
+ setResolverOption('mobileView', Mobile.mobileView);
}
};
diff --git a/app/assets/javascripts/discourse/initializers/page-tracking.js.es6 b/app/assets/javascripts/discourse/initializers/page-tracking.js.es6
index 860ddaf0f80..cf978f43006 100644
--- a/app/assets/javascripts/discourse/initializers/page-tracking.js.es6
+++ b/app/assets/javascripts/discourse/initializers/page-tracking.js.es6
@@ -1,4 +1,4 @@
-import { cleanDOM } from 'discourse/routes/discourse';
+import { cleanDOM } from 'discourse/lib/clean-dom';
import { startPageTracking, onPageChange } from 'discourse/lib/page-tracker';
import { viewTrackingRequired } from 'discourse/lib/ajax';
@@ -7,30 +7,10 @@ export default {
initialize(container) {
- const cache = {};
- var transitionCount = 0;
-
// Tell our AJAX system to track a page transition
const router = container.lookup('router:main');
router.on('willTransition', viewTrackingRequired);
-
- router.on('didTransition', function() {
- Em.run.scheduleOnce('afterRender', Ember.Route, cleanDOM);
- transitionCount++;
- _.each(cache, (v,k) => {
- if (v && v.target && v.target < transitionCount) {
- delete cache[k];
- }
- });
- });
-
- router.transientCache = function(key, data, count) {
- if (data === undefined) {
- return cache[key];
- } else {
- return cache[key] = {data, target: transitionCount + count};
- }
- };
+ router.on('didTransition', cleanDOM);
startPageTracking(router);
diff --git a/app/assets/javascripts/discourse/initializers/post-decorations.js.es6 b/app/assets/javascripts/discourse/initializers/post-decorations.js.es6
index df6e8d8bc27..d17b2087acd 100644
--- a/app/assets/javascripts/discourse/initializers/post-decorations.js.es6
+++ b/app/assets/javascripts/discourse/initializers/post-decorations.js.es6
@@ -8,6 +8,18 @@ export default {
withPluginApi('0.1', api => {
api.decorateCooked(highlightSyntax);
api.decorateCooked(lightbox);
+
+ api.decorateCooked($elem => {
+ const players = $('audio', $elem);
+ if (players.length) {
+ players.on('play', () => {
+ const postId = parseInt($elem.closest('article').data('post-id'));
+ if (postId) {
+ api.preventCloak(postId);
+ }
+ });
+ }
+ });
});
}
};
diff --git a/app/assets/javascripts/discourse/initializers/subscribe-user-notifications.js.es6 b/app/assets/javascripts/discourse/initializers/subscribe-user-notifications.js.es6
index 1d8260f4015..8061b579b91 100644
--- a/app/assets/javascripts/discourse/initializers/subscribe-user-notifications.js.es6
+++ b/app/assets/javascripts/discourse/initializers/subscribe-user-notifications.js.es6
@@ -8,6 +8,7 @@ import {
export default {
name: 'subscribe-user-notifications',
after: 'message-bus',
+
initialize(container) {
const user = container.lookup('current-user:main'),
site = container.lookup('site:main'),
@@ -22,12 +23,11 @@ export default {
keyValueStore.remove('recent-notifications');
if (user) {
-
if (user.get('staff')) {
- bus.subscribe('/flagged_counts', (data) => {
+ bus.subscribe('/flagged_counts', data => {
user.set('site_flagged_posts_count', data.total);
});
- bus.subscribe('/queue_counts', (data) => {
+ bus.subscribe('/queue_counts', data => {
user.set('post_queue_new_count', data.post_queue_new_count);
if (data.post_queue_new_count > 0) {
user.set('show_queued_posts', 1);
@@ -35,12 +35,13 @@ export default {
});
}
- bus.subscribe(`/notification/${user.get('id')}`, function(data) {
+ bus.subscribe(`/notification/${user.get('id')}`, data => {
const oldUnread = user.get('unread_notifications');
const oldPM = user.get('unread_private_messages');
user.set('unread_notifications', data.unread_notifications);
user.set('unread_private_messages', data.unread_private_messages);
+ user.set('read_first_notification', data.read_first_notification);
if (oldUnread !== data.unread_notifications || oldPM !== data.unread_private_messages) {
appEvents.trigger('notifications:changed');
@@ -50,27 +51,23 @@ export default {
const lastNotification = data.last_notification && data.last_notification.notification;
if (stale && stale.hasResults && lastNotification) {
-
const oldNotifications = stale.results.get('content');
const staleIndex = _.findIndex(oldNotifications, {id: lastNotification.id});
if (staleIndex === -1) {
// this gets a bit tricky, uread pms are bumped to front
- var insertPosition = 0;
+ let insertPosition = 0;
if (lastNotification.notification_type !== 6) {
- insertPosition = _.findIndex(oldNotifications, function(n){
- return n.notification_type !== 6 || n.read;
- });
+ insertPosition = _.findIndex(oldNotifications, n => n.notification_type !== 6 || n.read);
insertPosition = insertPosition === -1 ? oldNotifications.length - 1 : insertPosition;
}
-
oldNotifications.insertAt(insertPosition, Em.Object.create(lastNotification));
}
- for (var idx=0; idx < data.recent.length; idx++) {
- var old;
+ for (let idx=0; idx < data.recent.length; idx++) {
+ let old;
while(old = oldNotifications[idx]) {
- var info = data.recent[idx];
+ const info = data.recent[idx];
if (old.get('id') !== info[0]) {
oldNotifications.removeAt(idx);
@@ -81,24 +78,18 @@ export default {
break;
}
}
- if ( !old ) { break; }
+ if (!old) { break; }
}
}
}, user.notification_channel_position);
- bus.subscribe("/categories", function(data) {
- _.each(data.categories, function(c) {
- site.updateCategory(c);
- });
- _.each(data.deleted_categories,function(id) {
- site.removeCategory(id);
- });
+ bus.subscribe("/categories", data => {
+ _.each(data.categories, c => site.updateCategory(c));
+ _.each(data.deleted_categories, id => site.removeCategory(id));
});
- bus.subscribe("/client_settings", function(data) {
- siteSettings[data.name] = data.value;
- });
+ bus.subscribe("/client_settings", data => Ember.set(siteSettings, data.name, data.value));
if (!Ember.testing) {
if (!site.mobileView) {
diff --git a/app/assets/javascripts/discourse/lib/autocomplete.js.es6 b/app/assets/javascripts/discourse/lib/autocomplete.js.es6
index 10bc508b129..5e1d404bc9d 100644
--- a/app/assets/javascripts/discourse/lib/autocomplete.js.es6
+++ b/app/assets/javascripts/discourse/lib/autocomplete.js.es6
@@ -42,7 +42,7 @@ export default function(options) {
if (this.length === 0) return;
- if (options === 'destroy') {
+ if (options === 'destroy' || options.updateData) {
Ember.run.cancel(inputTimeout);
$(this).off('keyup.autocomplete')
@@ -50,7 +50,10 @@ export default function(options) {
.off('paste.autocomplete')
.off('click.autocomplete');
- return;
+ $(window).off('click.autocomplete');
+
+ if (options === 'destroy')
+ return;
}
if (options && options.cancel && this.data("closeAutocomplete")) {
@@ -162,28 +165,46 @@ export default function(options) {
if (isInput) {
const width = this.width();
- wrap = this.wrap("").parent();
- wrap.width(width);
+
+ if (options.updateData) {
+ wrap = this.parent();
+ wrap.find('.item').remove();
+ me.show();
+ } else {
+ wrap = this.wrap("").parent();
+ wrap.width(width);
+ }
+
if(options.single) {
this.css("width","100%");
} else {
this.width(150);
}
- this.attr('name', this.attr('name') + "-renamed");
+
+ this.attr('name', (options.updateData) ? this.attr('name') : this.attr('name') + "-renamed");
+
var vals = this.val().split(",");
_.each(vals,function(x) {
if (x !== "") {
if (options.reverseTransform) {
x = options.reverseTransform(x);
}
+ if(options.single){
+ me.hide();
+ }
addInputSelectedItem(x);
}
});
+
if(options.items) {
_.each(options.items, function(item){
+ if(options.single){
+ me.hide();
+ }
addInputSelectedItem(item);
});
}
+
this.val("");
completeStart = 0;
wrap.click(function() {
@@ -237,15 +258,19 @@ export default function(options) {
me.parent().append(div);
- if(!isInput){
+ if (!isInput) {
vOffset = div.height();
- }
- if (Discourse.Site.currentProp('mobileView') && !isInput) {
- div.css('width', 'auto');
+ if ((window.innerHeight - me.outerHeight() - $("header.d-header").innerHeight()) < vOffset) {
+ vOffset = -23;
+ }
- if ((me.height() / 2) >= pos.top) { vOffset = -23; }
- if ((me.width() / 2) <= pos.left) { hOffset = -div.width(); }
+ if (Discourse.Site.currentProp('mobileView')) {
+ div.css('width', 'auto');
+
+ if ((me.height() / 2) >= pos.top) { vOffset = -23; }
+ if ((me.width() / 2) <= pos.left) { hOffset = -div.width(); }
+ }
}
var mePos = me.position();
@@ -308,6 +333,7 @@ export default function(options) {
closeAutocomplete();
});
+ $(window).on('click.autocomplete', () => closeAutocomplete());
$(this).on('click.autocomplete', () => closeAutocomplete());
$(this).on('paste.autocomplete', function() {
diff --git a/app/assets/javascripts/discourse/lib/clean-dom.js.es6 b/app/assets/javascripts/discourse/lib/clean-dom.js.es6
new file mode 100644
index 00000000000..8f86e6a6fd7
--- /dev/null
+++ b/app/assets/javascripts/discourse/lib/clean-dom.js.es6
@@ -0,0 +1,32 @@
+function _clean() {
+ if (window.MiniProfiler) {
+ window.MiniProfiler.pageTransition();
+ }
+
+ // Close some elements that may be open
+ $('header ul.icons li').removeClass('active');
+ $('[data-toggle="dropdown"]').parent().removeClass('open');
+ // close the lightbox
+ if ($.magnificPopup && $.magnificPopup.instance) {
+ $.magnificPopup.instance.close();
+ $('body').removeClass('mfp-zoom-out-cur');
+ }
+
+ // Remove any link focus
+ // NOTE: the '.not("body")' is here to prevent a bug in IE10 on Win7
+ // cf. https://stackoverflow.com/questions/5657371
+ $(document.activeElement).not("body").not(".no-blur").blur();
+
+ Discourse.set('notifyCount',0);
+ Discourse.__container__.lookup('route:application').send('closeModal');
+ const hideDropDownFunction = $('html').data('hide-dropdown');
+ if (hideDropDownFunction) { hideDropDownFunction(); }
+
+ // TODO: Avoid container lookup here
+ const appEvents = Discourse.__container__.lookup('app-events:main');
+ appEvents.trigger('dom:clean');
+}
+
+export function cleanDOM() {
+ Ember.run.scheduleOnce('afterRender', _clean);
+}
diff --git a/app/assets/javascripts/discourse/lib/computed.js.es6 b/app/assets/javascripts/discourse/lib/computed.js.es6
index 1fb7e745cb5..02d38869fe2 100644
--- a/app/assets/javascripts/discourse/lib/computed.js.es6
+++ b/app/assets/javascripts/discourse/lib/computed.js.es6
@@ -1,3 +1,4 @@
+import addonFmt from 'ember-addons/fmt';
/**
Returns whether two properties are equal to each other.
@@ -46,14 +47,10 @@ export function propertyLessThan(p1, p2) {
@params {String} format the i18n format string
@return {Function} computedProperty function
**/
-export function i18n() {
- const args = Array.prototype.slice.call(arguments, 0);
+export function i18n(...args) {
const format = args.pop();
- const computed = Em.computed(function() {
- const self = this;
- return I18n.t(format.fmt.apply(format, args.map(function (a) {
- return self.get(a);
- })));
+ const computed = Ember.computed(function() {
+ return I18n.t(addonFmt(format, ...args.map(a => this.get(a))));
});
return computed.property.apply(computed, args);
}
@@ -67,14 +64,10 @@ export function i18n() {
@params {String} format the format string
@return {Function} computedProperty function
**/
-export function fmt() {
- const args = Array.prototype.slice.call(arguments, 0);
+export function fmt(...args) {
const format = args.pop();
- const computed = Em.computed(function() {
- const self = this;
- return format.fmt.apply(format, args.map(function (a) {
- return self.get(a);
- }));
+ const computed = Ember.computed(function() {
+ return addonFmt(format, ...args.map(a => this.get(a)));
});
return computed.property.apply(computed, args);
}
@@ -88,14 +81,10 @@ export function fmt() {
@params {String} format the format string for the URL
@return {Function} computedProperty function returning a URL
**/
-export function url() {
- const args = Array.prototype.slice.call(arguments, 0);
+export function url(...args) {
const format = args.pop();
- const computed = Em.computed(function() {
- const self = this;
- return Discourse.getURL(format.fmt.apply(format, args.map(function (a) {
- return self.get(a);
- })));
+ const computed = Ember.computed(function() {
+ return Discourse.getURL(addonFmt(format, ...args.map(a => this.get(a))));
});
return computed.property.apply(computed, args);
}
diff --git a/app/assets/javascripts/discourse/lib/emoji/groups.js.es6 b/app/assets/javascripts/discourse/lib/emoji/groups.js.es6
index 0ebc6c500a7..7b8d9bbedf6 100644
--- a/app/assets/javascripts/discourse/lib/emoji/groups.js.es6
+++ b/app/assets/javascripts/discourse/lib/emoji/groups.js.es6
@@ -171,7 +171,25 @@ const groups = [
"vulcan",
"wind_blowing_face",
"writing_hand",
- "zipper_mouth"
+ "zipper_mouth",
+ "female_couple_with_heart",
+ "male_couple_with_heart",
+ "female_couplekiss",
+ "male_couplekiss",
+ "family_man_woman_girl",
+ "family_man_woman_girl_boy",
+ "family_man_woman_boys",
+ "family_man_woman_girls",
+ "family_women_boy",
+ "family_women_girl",
+ "family_women_girl_boy",
+ "family_women_boys",
+ "family_women_girls",
+ "family_men_boy",
+ "family_men_girl",
+ "family_men_girl_boy",
+ "family_men_boys",
+ "family_men_girls"
]
},
{
@@ -913,6 +931,7 @@ const groups = [
"eight",
"nine",
"keycap_ten",
+ "keycap_star",
"1234",
"hash",
"abc",
@@ -1102,6 +1121,7 @@ const groups = [
"wastebasket",
"wheel_of_dharma",
"yin_yang",
+ "left_speech_bubble"
]
}
];
diff --git a/app/assets/javascripts/discourse/lib/emoji/toolbar.js.es6 b/app/assets/javascripts/discourse/lib/emoji/toolbar.js.es6
index fff8079cf36..3666df1b580 100644
--- a/app/assets/javascripts/discourse/lib/emoji/toolbar.js.es6
+++ b/app/assets/javascripts/discourse/lib/emoji/toolbar.js.es6
@@ -2,6 +2,7 @@ import groups from 'discourse/lib/emoji/groups';
import KeyValueStore from "discourse/lib/key-value-store";
import { emojiList } from 'pretty-text/emoji';
import { emojiUrlFor } from 'discourse/lib/text';
+import { findRawTemplate } from 'discourse/lib/raw-templates';
const keyValueStore = new KeyValueStore("discourse_emojis_");
const EMOJI_USAGE = "emojiUsage";
@@ -68,7 +69,7 @@ function initializeRecentlyUsedIcons() {
recent.forEach(emoji => recentlyUsedIcons.push(emoji.title));
- const recentGroup = groups.findProperty('name', 'recent');
+ const recentGroup = groups.findBy('name', 'recent');
if (recentGroup) {
recentGroup.icons = recentlyUsedIcons;
} else {
@@ -151,7 +152,7 @@ function render(page, offset, options) {
};
$('.emoji-modal', options.appendTo).remove();
- const template = options.container.lookup('template:emoji-toolbar.raw');
+ const template = findRawTemplate('emoji-toolbar');
options.appendTo.append(template(model));
bindEvents(page, offset, options);
diff --git a/app/assets/javascripts/discourse/lib/export-csv.js.es6 b/app/assets/javascripts/discourse/lib/export-csv.js.es6
index 691f059efee..dc6e66b3a9a 100644
--- a/app/assets/javascripts/discourse/lib/export-csv.js.es6
+++ b/app/assets/javascripts/discourse/lib/export-csv.js.es6
@@ -8,9 +8,9 @@ function exportEntityByType(type, entity, args) {
export function exportUserArchive() {
return exportEntityByType('user', 'user_archive').then(function() {
- bootbox.alert(I18n.t("admin.export_csv.success"));
+ bootbox.alert(I18n.t("user.download_archive.success"));
}).catch(function() {
- bootbox.alert(I18n.t("admin.export_csv.rate_limit_error"));
+ bootbox.alert(I18n.t("user.download_archive.rate_limit_error"));
});
}
diff --git a/app/assets/javascripts/discourse/lib/formatter.js.es6 b/app/assets/javascripts/discourse/lib/formatter.js.es6
index 4ef0e9fe352..b478ddfa438 100644
--- a/app/assets/javascripts/discourse/lib/formatter.js.es6
+++ b/app/assets/javascripts/discourse/lib/formatter.js.es6
@@ -74,7 +74,7 @@ export function toTitleCase(str) {
export function longDate(dt) {
if (!dt) return;
- return moment(dt).longDate();
+ return moment(dt).format(I18n.t("dates.long_with_year"));
}
// suppress year, if current year
@@ -132,7 +132,8 @@ function wrapAgo(dateStr) {
function relativeAgeTiny(date, ageOpts) {
const format = "tiny";
const distance = Math.round((new Date() - date) / 1000);
- const distanceInMinutes = Math.round(distance / 60.0);
+ const dividedDistance = Math.round(distance / 60.0);
+ const distanceInMinutes = (dividedDistance < 1) ? 1 : dividedDistance;
let formatted;
const t = function(key, opts) {
@@ -140,11 +141,9 @@ function relativeAgeTiny(date, ageOpts) {
return (ageOpts && ageOpts.addAgo) ? wrapAgo(result) : result;
};
+
switch(true) {
- case(distanceInMinutes < 1):
- formatted = t("less_than_x_minutes", {count: 1});
- break;
- case(distanceInMinutes >= 1 && distanceInMinutes <= 44):
+ case(distanceInMinutes >= 0 && distanceInMinutes <= 44):
formatted = t("x_minutes", {count: distanceInMinutes});
break;
case(distanceInMinutes >= 45 && distanceInMinutes <= 89):
@@ -266,3 +265,20 @@ export function number(val) {
}
return val.toString();
}
+
+export function ensureJSON(json) {
+ return typeof json === 'string' ? JSON.parse(json) : json;
+}
+
+export function plainJSON(val) {
+ let json = ensureJSON(val);
+ let headers = '';
+ Object.keys(json).forEach(k => {
+ headers += `${k}: ${json[k]}\n`;
+ });
+ return headers;
+}
+
+export function prettyJSON(json) {
+ return JSON.stringify(ensureJSON(json), null, 2);
+}
diff --git a/app/assets/javascripts/discourse/lib/intercept-click.js.es6 b/app/assets/javascripts/discourse/lib/intercept-click.js.es6
index 09367beca23..758164e784d 100644
--- a/app/assets/javascripts/discourse/lib/intercept-click.js.es6
+++ b/app/assets/javascripts/discourse/lib/intercept-click.js.es6
@@ -21,13 +21,14 @@ export default function interceptClick(e) {
$currentTarget.data('ember-action') ||
$currentTarget.data('auto-route') ||
$currentTarget.data('share-url') ||
- $currentTarget.data('user-card') ||
$currentTarget.hasClass('widget-link') ||
$currentTarget.hasClass('mention') ||
- (!$currentTarget.hasClass('d-link') && $currentTarget.hasClass('ember-view')) ||
+ (!$currentTarget.hasClass('d-link') &&
+ !$currentTarget.data('user-card') &&
+ $currentTarget.hasClass('ember-view')) ||
$currentTarget.hasClass('lightbox') ||
href.indexOf("mailto:") === 0 ||
- (href.match(/^http[s]?:\/\//i) && !href.match(new RegExp("^http:\\/\\/" + window.location.hostname, "i")))) {
+ (href.match(/^http[s]?:\/\//i) && !href.match(new RegExp("^https?:\\/\\/" + window.location.hostname, "i")))) {
return;
}
diff --git a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6 b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6
index 70af9c9526c..d393127a732 100644
--- a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6
+++ b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6
@@ -4,7 +4,7 @@ import { scrollTopFor } from 'discourse/lib/offset-calculator';
const bindings = {
'!': {postAction: 'showFlags'},
- '#': {handler: 'toggleProgress', anonymous: true},
+ '#': {handler: 'goToPost', anonymous: true},
'/': {handler: 'toggleSearch', anonymous: true},
'=': {handler: 'toggleHamburgerMenu', anonymous: true},
'?': {handler: 'showHelpModal', anonymous: true},
@@ -13,6 +13,8 @@ const bindings = {
'c': {handler: 'createTopic'},
'ctrl+f': {handler: 'showPageSearch', anonymous: true},
'command+f': {handler: 'showPageSearch', anonymous: true},
+ 'ctrl+p': {handler: 'printTopic', anonymous: true},
+ 'command+p': {handler: 'printTopic', anonymous: true},
'd': {postAction: 'deletePost'},
'e': {postAction: 'editPost'},
'end': {handler: 'goToLastPost', anonymous: true},
@@ -151,6 +153,15 @@ export default {
});
},
+ printTopic(event) {
+ Ember.run(() => {
+ if ($('.container.posts').length) {
+ event.preventDefault(); // We need to stop printing the current page in Firefox
+ this.container.lookup('controller:topic').print();
+ }
+ });
+ },
+
createTopic() {
this.container.lookup('controller:composer').open({action: Composer.CREATE_TOPIC, draftKey: Composer.CREATE_TOPIC});
},
@@ -159,8 +170,8 @@ export default {
this.container.lookup('controller:topic').togglePinnedState();
},
- toggleProgress() {
- this.appEvents.trigger('topic-progress:keyboard-trigger', { type: 'jump' });
+ goToPost() {
+ this.appEvents.trigger('topic:keyboard-trigger', { type: 'jump' });
},
toggleSearch(event) {
@@ -198,8 +209,11 @@ export default {
sendToTopicListItemView(action) {
const elem = $('tr.selected.topic-list-item.ember-view')[0];
if (elem) {
- const view = Ember.View.views[elem.id];
- view.send(action);
+ const registry = this.container.lookup('-view-registry:main');
+ if (registry) {
+ const view = registry[elem.id];
+ view.send(action);
+ }
}
},
@@ -277,7 +291,9 @@ export default {
return;
}
- const $selected = $articles.filter('.selected');
+ const $selected = ($articles.filter('.selected').length !== 0)
+ ? $articles.filter('.selected')
+ : $articles.filter('[data-islastviewedtopic=true]');
let index = $articles.index($selected);
if ($selected.length !== 0) { //boundries check
diff --git a/app/assets/javascripts/discourse/lib/link-mentions.js.es6 b/app/assets/javascripts/discourse/lib/link-mentions.js.es6
index 149b151617b..20876bd72e6 100644
--- a/app/assets/javascripts/discourse/lib/link-mentions.js.es6
+++ b/app/assets/javascripts/discourse/lib/link-mentions.js.es6
@@ -1,37 +1,40 @@
import { ajax } from 'discourse/lib/ajax';
+
function replaceSpan($e, username, opts) {
+ let extra = "";
+ let extraClass = "";
+
if (opts && opts.group) {
- var extra = "", extraClass = "";
if (opts.mentionable) {
- extra = " data-name='" + username + "' data-mentionable-user-count='" + opts.mentionable.user_count + "' ";
- extraClass = " notify";
+ extra = `data-name='${username}' data-mentionable-user-count='${opts.mentionable.user_count}'`;
+ extraClass = "notify";
}
- $e.replaceWith("@" + username + "");
+ $e.replaceWith(`@${username}`);
} else {
- $e.replaceWith("@" + username + "");
+ if (opts && opts.cannot_see) {
+ extra = `data-name='${username}'`;
+ extraClass = "cannot-see";
+ }
+ $e.replaceWith(`@${username}`);
}
}
-const found = [];
-const foundGroups = [];
-const mentionableGroups = [];
-const checked = [];
+const found = {};
+const foundGroups = {};
+const mentionableGroups = {};
+const checked = {};
+const cannotSee = [];
function updateFound($mentions, usernames) {
Ember.run.scheduleOnce('afterRender', function() {
$mentions.each((i, e) => {
const $e = $(e);
const username = usernames[i];
- if (found.indexOf(username.toLowerCase()) !== -1) {
- replaceSpan($e, username);
- } else if (foundGroups.indexOf(username) !== -1) {
- const mentionable = _(mentionableGroups).where({name: username}).first();
- replaceSpan($e, username, {group: true, mentionable: mentionable});
- } else if (checked.indexOf(username) !== -1) {
+ if (found[username.toLowerCase()]) {
+ replaceSpan($e, username, { cannot_see: cannotSee[username] });
+ } else if (foundGroups[username]) {
+ replaceSpan($e, username, { group: true, mentionable: mentionableGroups[username] });
+ } else if (checked[username]) {
$e.addClass('mention-tested');
}
});
@@ -42,22 +45,21 @@ export function linkSeenMentions($elem, siteSettings) {
const $mentions = $('span.mention:not(.mention-tested)', $elem);
if ($mentions.length) {
const usernames = $mentions.map((_, e) => $(e).text().substr(1));
- const unseen = _.uniq(usernames).filter((u) => {
- return u.length >= siteSettings.min_username_length && checked.indexOf(u) === -1;
- });
updateFound($mentions, usernames);
- return unseen;
+ return _.uniq(usernames).filter(u => !checked[u] && u.length >= siteSettings.min_username_length);
}
-
return [];
}
-export function fetchUnseenMentions($elem, usernames) {
- return ajax("/users/is_local_username", { data: { usernames } }).then(function(r) {
- found.push.apply(found, r.valid);
- foundGroups.push.apply(foundGroups, r.valid_groups);
- mentionableGroups.push.apply(mentionableGroups, r.mentionable_groups);
- checked.push.apply(checked, usernames);
+// 'Create a New Topic' scenario is not supported (per conversation with codinghorror)
+// https://meta.discourse.org/t/taking-another-1-7-release-task/51986/7
+export function fetchUnseenMentions(usernames, topic_id) {
+ return ajax("/users/is_local_username", { data: { usernames, topic_id } }).then(r => {
+ r.valid.forEach(v => found[v] = true);
+ r.valid_groups.forEach(vg => foundGroups[vg] = true);
+ r.mentionable_groups.forEach(mg => mentionableGroups[mg.name] = mg);
+ r.cannot_see.forEach(cs => cannotSee[cs] = true);
+ usernames.forEach(u => checked[u] = true);
return r;
});
}
diff --git a/app/assets/javascripts/discourse/lib/load-script.js.es6 b/app/assets/javascripts/discourse/lib/load-script.js.es6
index 4edc9a452ac..cc24df86de8 100644
--- a/app/assets/javascripts/discourse/lib/load-script.js.es6
+++ b/app/assets/javascripts/discourse/lib/load-script.js.es6
@@ -5,13 +5,16 @@ const _loading = {};
function loadWithTag(path, cb) {
const head = document.getElementsByTagName('head')[0];
+ let finished = false;
let s = document.createElement('script');
s.src = path;
- if (Ember.Test) { Ember.Test.pendingAjaxRequests++; }
+ if (Ember.Test) {
+ Ember.Test.registerWaiter(() => finished);
+ }
head.appendChild(s);
s.onload = s.onreadystatechange = function(_, abort) {
- if (Ember.Test) { Ember.Test.pendingAjaxRequests--; }
+ finished = true;
if (abort || !s.readyState || s.readyState === "loaded" || s.readyState === "complete") {
s = s.onload = s.onreadystatechange = null;
if (!abort) {
diff --git a/app/assets/javascripts/discourse/lib/mobile.js.es6 b/app/assets/javascripts/discourse/lib/mobile.js.es6
index ef2d07bbfd8..2ceb13ba51b 100644
--- a/app/assets/javascripts/discourse/lib/mobile.js.es6
+++ b/app/assets/javascripts/discourse/lib/mobile.js.es6
@@ -1,3 +1,5 @@
+import deprecated from 'discourse-common/lib/deprecated';
+
let mobileForced = false;
// An object that is responsible for logic related to mobile devices.
@@ -29,6 +31,18 @@ const Mobile = {
// localStorage may be disabled, just skip this
// you get security errors if it is disabled
}
+
+ // Sam: I tried this to disable zooming on iOS 10 but it is not consistent
+ // you can still sometimes trigger zoom and be stuck in a horrible state
+ //
+ // let iOS = !!navigator.platform && /iPad|iPhone|iPod/.test(navigator.platform);
+ // if (iOS) {
+ // document.documentElement.addEventListener('touchstart', function (event) {
+ // if (event.touches.length > 1) {
+ // event.preventDefault();
+ // }
+ // }, false);
+ // }
},
toggleMobileView() {
@@ -55,10 +69,9 @@ export function resetMobile() {
mobileForced = false;
}
-// Backwards compatibiltity, deprecated
Object.defineProperty(Discourse, 'Mobile', {
- get: function() {
- Ember.warn("DEPRECATION: `Discourse.Mobile` is deprecated, use `this.site.mobileView` instead");
+ get() {
+ deprecated("`Discourse.Mobile` is deprecated, use `this.site.mobileView` instead");
return Mobile;
}
});
diff --git a/app/assets/javascripts/discourse/lib/page-tracker.js.es6 b/app/assets/javascripts/discourse/lib/page-tracker.js.es6
index 7e63b5c7311..ddef4792680 100644
--- a/app/assets/javascripts/discourse/lib/page-tracker.js.es6
+++ b/app/assets/javascripts/discourse/lib/page-tracker.js.es6
@@ -1,7 +1,21 @@
+import deprecated from 'discourse-common/lib/deprecated';
+
const PageTracker = Ember.Object.extend(Ember.Evented);
let _pageTracker = PageTracker.create();
let _started = false;
+
+const cache = {};
+let transitionCount = 0;
+
+export function setTransient(key, data, count) {
+ cache[key] = {data, target: transitionCount + count};
+}
+
+export function getTransient(key) {
+ return cache[key];
+}
+
export function startPageTracking(router) {
if (_started) { return; }
@@ -11,8 +25,13 @@ export function startPageTracking(router) {
// Refreshing the title is debounced, so we need to trigger this in the
// next runloop to have the correct title.
- Em.run.next(() => {
- _pageTracker.trigger('change', url, Discourse.get('_docTitle'));
+ Em.run.next(() => _pageTracker.trigger('change', url, Discourse.get('_docTitle')));
+
+ transitionCount++;
+ _.each(cache, (v,k) => {
+ if (v && v.target && v.target < transitionCount) {
+ delete cache[k];
+ }
});
});
_started = true;
@@ -25,7 +44,7 @@ export function onPageChange(fn) {
// backwards compatibility
const BackwardsCompat = {
current() {
- console.warn(`Using PageTracker.current() is deprecated. Your plugin should use the PluginAPI`);
+ deprecated(`Using PageTracker.current() is deprecated. Your plugin should use the PluginAPI`);
return _pageTracker;
}
};
diff --git a/app/assets/javascripts/discourse/lib/plugin-api.js.es6 b/app/assets/javascripts/discourse/lib/plugin-api.js.es6
index 9aedcec64cb..b8beb0020d9 100644
--- a/app/assets/javascripts/discourse/lib/plugin-api.js.es6
+++ b/app/assets/javascripts/discourse/lib/plugin-api.js.es6
@@ -1,4 +1,4 @@
-import { iconNode } from 'discourse/helpers/fa-icon';
+import { iconNode } from 'discourse/helpers/fa-icon-node';
import { addDecorator } from 'discourse/widgets/post-cooked';
import ComposerEditor from 'discourse/components/composer-editor';
import { addButton } from 'discourse/widgets/post-menu';
@@ -11,7 +11,7 @@ import { preventCloak } from 'discourse/widgets/post-stream';
import { h } from 'virtual-dom';
import { addFlagProperty } from 'discourse/components/site-header';
import { addPopupMenuOptionsCallback } from 'discourse/controllers/composer';
-import { emojiUrlFor } from 'discourse/lib/text';
+import { extraConnectorClass } from 'discourse/lib/plugin-connectors';
class PluginApi {
constructor(version, container) {
@@ -93,12 +93,11 @@ class PluginApi {
if (result.icon) {
iconBody = iconNode(result.icon);
} else if (result.emoji) {
- iconBody = result.emoji.split('|').map(emoji => {
- const src = emojiUrlFor(emoji);
- return dec.h('img', { className: 'emoji', attributes: { src } });
+ iconBody = result.emoji.split('|').map(name => {
+ let widgetAttrs = { name };
+ if (result.emojiTitle) widgetAttrs.title = true;
+ return dec.attach('emoji', widgetAttrs);
});
-
- iconBody = result.emoji.split('|').map(name => dec.attach('emoji', { name }));
}
if (result.text) {
@@ -332,15 +331,41 @@ class PluginApi {
addStorePluralization(thing, plural) {
this.container.lookup("store:main").addPluralization(thing, plural);
}
+
+ /**
+ * Register a Connector class for a particular outlet and connector.
+ *
+ * For example, if the outlet is `user-profile-primary` and your connector
+ * template is called `my-connector.hbs`:
+ *
+ * ```javascript
+ * api.registerConnectorClass('user-profile-primary', 'my-connector', {
+ * shouldRender(args, component) {
+ * return component.siteSettings.my_plugin_enabled;
+ * }
+ * });
+ * ```
+ *
+ * For more information on connector classes, see:
+ * https://meta.discourse.org/t/important-changes-to-plugin-outlets-for-ember-2-10/54136
+ **/
+ registerConnectorClass(outletName, connectorName, klass) {
+ extraConnectorClass(`${outletName}/${connectorName}`, klass);
+ }
}
let _pluginv01;
function getPluginApi(version) {
version = parseFloat(version);
- if (version <= 0.5) {
+ if (version <= 0.6) {
if (!_pluginv01) {
_pluginv01 = new PluginApi(version, Discourse.__container__);
}
+
+ // We are recycling the compatible object, but let's update to the higher version
+ if (_pluginv01.version < version) {
+ _pluginv01.version = version;
+ }
return _pluginv01;
} else {
console.warn(`Plugin API v${version} is not supported`);
@@ -370,6 +395,10 @@ function decorate(klass, evt, cb) {
klass.reopen(mixin);
}
+export function resetPluginApi() {
+ _pluginv01 = null;
+}
+
export function decorateCooked() {
console.warn('`decorateCooked` has been removed. Use `getPluginApi(version).decorateCooked` instead');
}
diff --git a/app/assets/javascripts/discourse/lib/plugin-connectors.js.es6 b/app/assets/javascripts/discourse/lib/plugin-connectors.js.es6
new file mode 100644
index 00000000000..61cdbab2554
--- /dev/null
+++ b/app/assets/javascripts/discourse/lib/plugin-connectors.js.es6
@@ -0,0 +1,98 @@
+let _connectorCache;
+let _rawConnectorCache;
+let _extraConnectorClasses = {};
+let _classPaths;
+
+export function resetExtraClasses() {
+ _extraConnectorClasses = {};
+ _classPaths = undefined;
+}
+
+// Note: In plugins, define a class by path and it will be wired up automatically
+// eg: discourse/connectors//.js.es6
+export function extraConnectorClass(name, obj) {
+ _extraConnectorClasses[name] = obj;
+}
+
+const DefaultConnectorClass = {
+ actions: {},
+ shouldRender: () => true,
+ setupComponent() { }
+};
+
+function findOutlets(collection, callback) {
+ const disabledPlugins = Discourse.Site.currentProp('disabled_plugins') || [];
+
+ Object.keys(collection).forEach(function(res) {
+ if (res.indexOf("/connectors/") !== -1) {
+ // Skip any disabled plugins
+ for (let i=0; i {
+ _classPaths[`${outlet}/${un}`] = require(res).default;
+ });
+ }
+
+ const id = `${outletName}/${uniqueName}`;
+ let foundClass = _extraConnectorClasses[id] || _classPaths[id];
+
+ return foundClass ?
+ jQuery.extend({}, DefaultConnectorClass, foundClass) :
+ DefaultConnectorClass;
+}
+
+function buildConnectorCache() {
+ _connectorCache = {};
+
+ findOutlets(Ember.TEMPLATES, (outletName, resource, uniqueName) => {
+ _connectorCache[outletName] = _connectorCache[outletName] || [];
+
+ _connectorCache[outletName].push({
+ templateName: resource.replace('javascripts/', ''),
+ template: Ember.TEMPLATES[resource],
+ classNames: `${outletName}-outlet ${uniqueName}`,
+ connectorClass: findClass(outletName, uniqueName)
+ });
+ });
+}
+
+function buildRawConnectorCache() {
+ _rawConnectorCache = {};
+ findOutlets(Discourse.RAW_TEMPLATES, (outletName, resource) => {
+ _rawConnectorCache[outletName] = _rawConnectorCache[outletName] || [];
+ _rawConnectorCache[outletName].push({
+ template: Discourse.RAW_TEMPLATES[resource]
+ });
+ });
+}
+
+export function connectorsFor(outletName) {
+ if (!_connectorCache) { buildConnectorCache(); }
+ return _connectorCache[outletName] || [];
+}
+
+export function rawConnectorsFor(outletName) {
+ if (!_rawConnectorCache) { buildRawConnectorCache(); }
+ return _rawConnectorCache[outletName] || [];
+}
diff --git a/app/assets/javascripts/discourse/lib/quote-state.js.es6 b/app/assets/javascripts/discourse/lib/quote-state.js.es6
new file mode 100644
index 00000000000..db1e1826fb1
--- /dev/null
+++ b/app/assets/javascripts/discourse/lib/quote-state.js.es6
@@ -0,0 +1,15 @@
+export default class QuoteState {
+ constructor() {
+ this.clear();
+ }
+
+ selected(postId, buffer) {
+ this.postId = postId;
+ this.buffer = buffer;
+ }
+
+ clear() {
+ this.buffer = '';
+ this.postId = null;
+ }
+}
diff --git a/app/assets/javascripts/discourse/lib/raw-templates.js.es6 b/app/assets/javascripts/discourse/lib/raw-templates.js.es6
new file mode 100644
index 00000000000..89734b18aed
--- /dev/null
+++ b/app/assets/javascripts/discourse/lib/raw-templates.js.es6
@@ -0,0 +1,13 @@
+import { getResolverOption } from 'discourse-common/resolver';
+
+export function findRawTemplate(name) {
+ if (getResolverOption('mobileView')) {
+ return Discourse.RAW_TEMPLATES[`javascripts/mobile/${name}`] ||
+ Discourse.RAW_TEMPLATES[`javascripts/${name}`] ||
+ Discourse.RAW_TEMPLATES[`mobile/${name}`] ||
+ Discourse.RAW_TEMPLATES[name];
+ }
+
+ return Discourse.RAW_TEMPLATES[`javascripts/${name}`] ||
+ Discourse.RAW_TEMPLATES[name];
+}
diff --git a/app/assets/javascripts/discourse/lib/render-tag.js.es6 b/app/assets/javascripts/discourse/lib/render-tag.js.es6
index 5b627985413..356ee4b2c22 100644
--- a/app/assets/javascripts/discourse/lib/render-tag.js.es6
+++ b/app/assets/javascripts/discourse/lib/render-tag.js.es6
@@ -5,7 +5,7 @@ export default function renderTag(tag, params) {
tag = Handlebars.Utils.escapeExpression(tag);
const classes = ['tag-' + tag, 'discourse-tag'];
const tagName = params.tagName || "a";
- const href = tagName === "a" ? " href='" + Discourse.getURL("/tags/" + tag) + "' " : "";
+ const href = (tagName === "a" && !params.noHref) ? " href='" + Discourse.getURL("/tags/" + tag) + "' " : "";
if (Discourse.SiteSettings.tag_style || params.style) {
classes.push(params.style || Discourse.SiteSettings.tag_style);
diff --git a/app/assets/javascripts/discourse/lib/render-topic-featured-link.js.es6 b/app/assets/javascripts/discourse/lib/render-topic-featured-link.js.es6
new file mode 100644
index 00000000000..3b747284fdf
--- /dev/null
+++ b/app/assets/javascripts/discourse/lib/render-topic-featured-link.js.es6
@@ -0,0 +1,48 @@
+import { extractDomainFromUrl } from 'discourse/lib/utilities';
+import { h } from 'virtual-dom';
+
+const _decorators = [];
+
+export function addFeaturedLinkMetaDecorator(decorator) {
+ _decorators.push(decorator);
+}
+
+function extractLinkMeta(topic) {
+ const href = topic.featured_link,
+ target = Discourse.User.currentProp('external_links_in_new_tab') ? '_blank' : '';
+
+ if (!href) { return; }
+
+ let domain = extractDomainFromUrl(href);
+ if (!domain) { return; }
+
+ // www appears frequently, so we truncate it
+ if (domain && domain.substr(0, 4) === 'www.') {
+ domain = domain.substring(4);
+ }
+
+ const meta = { target, href, domain, rel: 'nofollow' };
+ if (_decorators.length) {
+ _decorators.forEach(cb => cb(meta));
+ }
+ return meta;
+}
+
+export default function renderTopicFeaturedLink(topic) {
+ const meta = extractLinkMeta(topic);
+ if (meta) {
+ return `${meta.domain}`;
+ } else {
+ return '';
+ }
+};
+
+export function topicFeaturedLinkNode(topic) {
+ const meta = extractLinkMeta(topic);
+ if (meta) {
+ return h('a.topic-featured-link', {
+ attributes: { href: meta.href, rel: meta.rel, target: meta.target }
+ }, meta.domain);
+ }
+}
+
diff --git a/app/assets/javascripts/discourse/lib/safari-hacks.js.es6 b/app/assets/javascripts/discourse/lib/safari-hacks.js.es6
index 1aa215f534f..6df7abd0d4b 100644
--- a/app/assets/javascripts/discourse/lib/safari-hacks.js.es6
+++ b/app/assets/javascripts/discourse/lib/safari-hacks.js.es6
@@ -6,7 +6,26 @@ function applicable() {
!navigator.userAgent.match(/Trident/g);
}
+
+function calcHeight(composingTopic) {
+ const winHeight = window.innerHeight;
+
+ // Hard code some known iOS resolutions
+ switch(winHeight) {
+ case 460: return composingTopic ? 250 : 260;
+ case 559: return composingTopic ? 325 : 308;
+ case 627:
+ case 628: return 360;
+ }
+
+ const ratio = composingTopic ? 0.54 : 0.6;
+ const min = composingTopic ? 300 : 350;
+ return Math.max(parseInt(winHeight*ratio), min);
+}
+
let workaroundActive = false;
+let composingTopic = false;
+
export function isWorkaroundActive() {
return workaroundActive;
}
@@ -22,27 +41,38 @@ function positioningWorkaround($fixedElement) {
var done = false;
var originalScrollTop = 0;
+ positioningWorkaround.blur = function(evt) {
+ if (workaroundActive) {
+ done = true;
+
+ $('#main-outlet').show();
+ $('header').show();
+
+ fixedElement.style.position = '';
+ fixedElement.style.top = '';
+ fixedElement.style.height = '';
+
+ $(window).scrollTop(originalScrollTop);
+
+ if (evt) {
+ evt.target.removeEventListener('blur', blurred);
+ }
+ workaroundActive = false;
+ }
+ };
+
var blurredNow = function(evt) {
if (!done && _.include($(document.activeElement).parents(), fixedElement)) {
// something in focus so skip
return;
}
- done = true;
-
- $('#main-outlet').show();
- $('header').show();
-
- fixedElement.style.position = '';
- fixedElement.style.top = '';
- fixedElement.style.height = '';
-
- $(window).scrollTop(originalScrollTop);
-
- if (evt) {
- evt.target.removeEventListener('blur', blurred);
+ if (composingTopic) {
+ return false;
}
- workaroundActive = false;
+
+ positioningWorkaround.blur(evt);
+
};
var blurred = _.debounce(blurredNow, 250);
@@ -73,7 +103,10 @@ function positioningWorkaround($fixedElement) {
fixedElement.style.top = '0px';
- const height = Math.max(parseInt(window.innerHeight*0.6), 350);
+ composingTopic = $('#reply-control select.category-combobox').length > 0;
+
+ const height = calcHeight(composingTopic);
+
fixedElement.style.height = height + "px";
// I used to do this, but it seems like we don't need to with position
diff --git a/app/assets/javascripts/discourse/lib/search.js.es6 b/app/assets/javascripts/discourse/lib/search.js.es6
index b0929ca60a1..9dc3b38e2f1 100644
--- a/app/assets/javascripts/discourse/lib/search.js.es6
+++ b/app/assets/javascripts/discourse/lib/search.js.es6
@@ -22,7 +22,10 @@ export function translateResults(results, opts) {
return topic;
});
- results.posts = results.posts.map(function(post){
+ results.posts = results.posts.map(post => {
+ if (post.username) {
+ post.userPath = Discourse.getURL(`/users/${post.username.toLowerCase()}`);
+ }
post = Post.create(post);
post.set('topic', topicMap[post.topic_id]);
return post;
@@ -34,31 +37,33 @@ export function translateResults(results, opts) {
});
results.categories = results.categories.map(function(category){
- return Category.list().findProperty('id', category.id);
+ return Category.list().findBy('id', category.id);
}).compact();
const r = results.grouped_search_result;
results.resultTypes = [];
// TODO: consider refactoring front end to take a better structure
- [['topic','posts'],['user','users'],['category','categories']].forEach(function(pair){
- const type = pair[0], name = pair[1];
- if (results[name].length > 0) {
- var result = {
- results: results[name],
- componentName: "search-result-" + ((opts.searchContext && opts.searchContext.type === 'topic' && type === 'topic') ? 'post' : type),
- type,
- more: r['more_' + name]
- };
+ if (r) {
+ [['topic','posts'],['user','users'],['category','categories']].forEach(function(pair){
+ const type = pair[0], name = pair[1];
+ if (results[name].length > 0) {
+ var result = {
+ results: results[name],
+ componentName: "search-result-" + ((opts.searchContext && opts.searchContext.type === 'topic' && type === 'topic') ? 'post' : type),
+ type,
+ more: r['more_' + name]
+ };
- if (result.more && name === "posts" && opts.fullSearchUrl) {
- result.more = false;
- result.moreUrl = opts.fullSearchUrl;
+ if (result.more && name === "posts" && opts.fullSearchUrl) {
+ result.more = false;
+ result.moreUrl = opts.fullSearchUrl;
+ }
+
+ results.resultTypes.push(result);
}
-
- results.resultTypes.push(result);
- }
- });
+ });
+ }
const noResults = !!(results.topics.length === 0 &&
results.posts.length === 0 &&
@@ -68,7 +73,7 @@ export function translateResults(results, opts) {
return noResults ? null : Em.Object.create(results);
}
-function searchForTerm(term, opts) {
+export function searchForTerm(term, opts) {
if (!opts) opts = {};
// Only include the data we have
@@ -92,7 +97,7 @@ function searchForTerm(term, opts) {
return promise;
}
-const searchContextDescription = function(type, name){
+export function searchContextDescription(type, name) {
if (type) {
switch(type) {
case 'topic':
@@ -107,17 +112,15 @@ const searchContextDescription = function(type, name){
}
};
-const getSearchKey = function(args){
+export function getSearchKey(args) {
return args.q + "|" + ((args.searchContext && args.searchContext.type) || "") + "|" +
((args.searchContext && args.searchContext.id) || "");
};
-const isValidSearchTerm = function(searchTerm) {
+export function isValidSearchTerm(searchTerm) {
if (searchTerm) {
return searchTerm.trim().length >= Discourse.SiteSettings.min_search_term_length;
} else {
return false;
}
};
-
-export { searchForTerm, searchContextDescription, getSearchKey, isValidSearchTerm };
diff --git a/app/assets/javascripts/discourse/lib/show-modal.js.es6 b/app/assets/javascripts/discourse/lib/show-modal.js.es6
index 6237163d061..ed2457e065f 100644
--- a/app/assets/javascripts/discourse/lib/show-modal.js.es6
+++ b/app/assets/javascripts/discourse/lib/show-modal.js.es6
@@ -9,23 +9,28 @@ export default function(name, opts) {
modalController.set('modalClass', null);
- const viewClass = container.lookupFactory('view:' + name);
- const controller = container.lookup('controller:' + name);
- if (viewClass) {
- route.render(name, { into: 'modal', outlet: 'modalBody' });
- } else {
- const templateName = Ember.String.dasherize(name);
+ const controllerName = opts.admin ? `modals/${name}` : name;
- const renderArgs = { into: 'modal', outlet: 'modalBody', view: 'modal-body'};
- if (controller) { renderArgs.controller = name; }
+ const controller = container.lookup('controller:' + controllerName);
+ const templateName = opts.templateName || Ember.String.dasherize(name);
- route.render('modal/' + templateName, renderArgs);
- if (opts.title) {
- modalController.set('title', I18n.t(opts.title));
- }
+ const renderArgs = { into: 'modal', outlet: 'modalBody'};
+ if (controller) { renderArgs.controller = controllerName; }
+
+ if (opts.addModalBodyView) {
+ renderArgs.view = 'modal-body';
+ }
+
+
+ const modalName = `modal/${templateName}`;
+ const fullName = opts.admin ? `admin/templates/${modalName}` : modalName;
+ route.render(fullName, renderArgs);
+ if (opts.title) {
+ modalController.set('title', I18n.t(opts.title));
}
if (controller) {
+ controller.set('modal', modalController);
const model = opts.model;
if (model) { controller.set('model', model); }
if (controller.onShow) { controller.onShow(); }
diff --git a/app/assets/javascripts/discourse/lib/text.js.es6 b/app/assets/javascripts/discourse/lib/text.js.es6
index 5a140b48c14..dc3c1cdf971 100644
--- a/app/assets/javascripts/discourse/lib/text.js.es6
+++ b/app/assets/javascripts/discourse/lib/text.js.es6
@@ -19,7 +19,7 @@ export function cook(text) {
}
export function sanitize(text) {
- return textSanitize(text, new WhiteLister(getOpts().features));
+ return textSanitize(text, new WhiteLister(getOpts()));
}
function emojiOptions() {
@@ -29,8 +29,8 @@ function emojiOptions() {
return { getURL: Discourse.getURLWithCDN, emojiSet: siteSettings.emoji_set };
}
-export function emojiUnescape(string) {
- const opts = emojiOptions();
+export function emojiUnescape(string, options) {
+ const opts = _.extend(emojiOptions(), options || {});
return opts ? performEmojiUnescape(string, opts) : string;
}
diff --git a/app/assets/javascripts/discourse/lib/transform-post.js.es6 b/app/assets/javascripts/discourse/lib/transform-post.js.es6
index 18da1e5993a..d9742501d6c 100644
--- a/app/assets/javascripts/discourse/lib/transform-post.js.es6
+++ b/app/assets/javascripts/discourse/lib/transform-post.js.es6
@@ -29,6 +29,9 @@ export function transformBasicPost(post) {
deletedByAvatarTemplate: null,
deletedByUsername: null,
primary_group_name: post.primary_group_name,
+ primary_group_flair_url: post.primary_group_flair_url,
+ primary_group_flair_bg_color: post.primary_group_flair_bg_color,
+ primary_group_flair_color: post.primary_group_flair_color,
wiki: post.wiki,
firstPost: post.post_number === 1,
post_number: post.post_number,
diff --git a/app/assets/javascripts/discourse/lib/url.js.es6 b/app/assets/javascripts/discourse/lib/url.js.es6
index 4b72cc26ebb..6aca579c130 100644
--- a/app/assets/javascripts/discourse/lib/url.js.es6
+++ b/app/assets/javascripts/discourse/lib/url.js.es6
@@ -5,6 +5,13 @@ import { defaultHomepage } from 'discourse/lib/utilities';
const rewrites = [];
const TOPIC_REGEXP = /\/t\/([^\/]+)\/(\d+)\/?(\d+)?/;
+// We can add links here that have server side responses but not client side.
+const SERVER_SIDE_ONLY = [
+ /^\/posts\/\d+\/raw/,
+ /\.rss$/,
+ /\.json/,
+];
+
let _jumpScheduled = false;
export function jumpToElement(elementId) {
if (_jumpScheduled || Ember.isEmpty(elementId)) { return; }
@@ -79,7 +86,7 @@ const DiscourseURL = Ember.Object.extend({
// Always use replaceState in the next runloop to prevent weird routes changing
// while URLs are loading. For example, while a topic loads it sets `currentPost`
// which triggers a replaceState even though the topic hasn't fully loaded yet!
- Em.run.next(function() {
+ Ember.run.next(() => {
const location = DiscourseURL.get('router.location');
if (location && location.replaceURL) {
location.replaceURL(path);
@@ -114,6 +121,15 @@ const DiscourseURL = Ember.Object.extend({
return;
}
+ const serverSide = SERVER_SIDE_ONLY.some(r => {
+ if (path.match(r)) {
+ document.location = path;
+ return true;
+ }
+ });
+
+ if (serverSide) { return; }
+
// Protocol relative URLs
if (path.indexOf('//') === 0) {
document.location = path;
@@ -121,7 +137,7 @@ const DiscourseURL = Ember.Object.extend({
}
// Scroll to the same page, different anchor
- const m = /#(.+)$/.exec(path);
+ const m = /^#(.+)$/.exec(path);
if (m) {
jumpToElement(m[1]);
return this.replaceState(path);
@@ -151,11 +167,6 @@ const DiscourseURL = Ember.Object.extend({
rewrites.forEach(rw => path = path.replace(rw.regexp, rw.replacement));
if (this.navigatedToPost(oldPath, path, opts)) { return; }
- // Schedule a DOM cleanup event
- Em.run.scheduleOnce('afterRender', Discourse.Route, 'cleanDOM');
-
- // TODO: Extract into rules we can inject into the URL handler
- if (this.navigatedToHome(oldPath, path, opts)) { return; }
if (oldPath === path) {
// If navigating to the same path send an app event. Views can watch it
@@ -163,6 +174,9 @@ const DiscourseURL = Ember.Object.extend({
this.appEvents.trigger('url:refresh');
}
+ // TODO: Extract into rules we can inject into the URL handler
+ if (this.navigatedToHome(oldPath, path, opts)) { return; }
+
return this.handleURL(path, opts);
},
@@ -256,7 +270,7 @@ const DiscourseURL = Ember.Object.extend({
@param {String} oldPath the previous path we were on
@param {String} path the path we're navigating to
**/
- navigatedToHome: function(oldPath, path) {
+ navigatedToHome(oldPath, path) {
const homepage = defaultHomepage();
if (window.history &&
@@ -271,7 +285,7 @@ const DiscourseURL = Ember.Object.extend({
},
// This has been extracted so it can be tested.
- origin: function() {
+ origin() {
return window.location.origin + (Discourse.BaseUri === "/" ? '' : Discourse.BaseUri);
},
@@ -318,7 +332,8 @@ const DiscourseURL = Ember.Object.extend({
const transition = router.handleURL(path);
transition._discourse_intercepted = true;
- transition.promise.then(() => jumpToElement(elementId));
+ const promise = transition.promise || transition;
+ promise.then(() => jumpToElement(elementId));
}
}).create();
diff --git a/app/assets/javascripts/discourse/lib/user-search.js.es6 b/app/assets/javascripts/discourse/lib/user-search.js.es6
index eb5bc209b35..def5e2e883a 100644
--- a/app/assets/javascripts/discourse/lib/user-search.js.es6
+++ b/app/assets/javascripts/discourse/lib/user-search.js.es6
@@ -59,7 +59,7 @@ function organizeResults(r, options) {
if (r.groups) {
r.groups.every(function(g) {
- if (results.length > limit) return false;
+ if (results.length > limit && options.term !== g.name) return false;
if (exclude.indexOf(g.name) === -1) {
groups.push(g);
results.push(g);
diff --git a/app/assets/javascripts/discourse/lib/utilities.js.es6 b/app/assets/javascripts/discourse/lib/utilities.js.es6
index 6dc7b93ecb1..154f92553b5 100644
--- a/app/assets/javascripts/discourse/lib/utilities.js.es6
+++ b/app/assets/javascripts/discourse/lib/utilities.js.es6
@@ -71,38 +71,41 @@ export function userUrl(username) {
export function emailValid(email) {
// see: http://stackoverflow.com/questions/46155/validate-email-address-in-javascript
- var re = /^[a-zA-Z0-9!#$%&'*+\/=?\^_`{|}~\-]+(?:\.[a-zA-Z0-9!#$%&'\*+\/=?\^_`{|}~\-]+)*@(?:[a-zA-Z0-9](?:[a-zA-Z0-9\-]*[a-zA-Z0-9])?\.)+[a-zA-Z0-9](?:[a-zA-Z0-9\-]*[a-zA-Z0-9])?$/;
+ const re = /^[a-zA-Z0-9!#$%&'*+\/=?\^_`{|}~\-]+(?:\.[a-zA-Z0-9!#$%&'\*+\/=?\^_`{|}~\-]+)*@(?:[a-zA-Z0-9](?:[a-zA-Z0-9\-]*[a-zA-Z0-9])?\.)+[a-zA-Z0-9](?:[a-zA-Z0-9\-]*[a-zA-Z0-9])?$/;
return re.test(email);
}
-export function selectedText() {
- var html = '';
+export function extractDomainFromUrl(url) {
+ if (url.indexOf("://") > -1) {
+ url = url.split('/')[2];
+ } else {
+ url = url.split('/')[0];
+ }
+ return url.split(':')[0];
+}
- if (typeof window.getSelection !== "undefined") {
- var sel = window.getSelection();
- if (sel.rangeCount) {
- var container = document.createElement("div");
- for (var i = 0, len = sel.rangeCount; i < len; ++i) {
- container.appendChild(sel.getRangeAt(i).cloneContents());
- }
- html = container.innerHTML;
- }
- } else if (typeof document.selection !== "undefined") {
- if (document.selection.type === "Text") {
- html = document.selection.createRange().htmlText;
- }
+export function selectedText() {
+ const selection = window.getSelection();
+ if (selection.isCollapsed) { return ""; }
+
+ const $div = $("");
+ for (let r = 0; r < selection.rangeCount; r++) {
+ const range = selection.getRangeAt(r);
+ const $ancestor = $(range.commonAncestorContainer);
+
+ // ensure we never quote text in the post menu area
+ const $postMenuArea = $ancestor.find(".post-menu-area")[0];
+ if ($postMenuArea) { range.setEndBefore($postMenuArea); }
+
+ $div.append(range.cloneContents());
}
- // Strip out any .click elements from the HTML before converting it to text
- var div = document.createElement('div');
- div.innerHTML = html;
- var $div = $(div);
- // Find all emojis and replace with its title attribute.
- $div.find('img.emoji').replaceWith(function() { return this.title; });
- $('.clicks', $div).remove();
- var text = div.textContent || div.innerText || "";
+ // strip click counters
+ $div.find(".clicks").remove();
+ // replace emojis
+ $div.find("img.emoji").replaceWith(function() { return this.title; });
- return String(text).trim();
+ return String($div.text()).trim();
}
// Determine the row and col of the caret in an element
@@ -155,7 +158,7 @@ export function setCaretPosition(ctrl, pos) {
}
}
-export function validateUploadedFiles(files, bypassNewUserRestriction) {
+export function validateUploadedFiles(files, opts) {
if (!files || files.length === 0) { return false; }
if (files.length > 1) {
@@ -163,31 +166,43 @@ export function validateUploadedFiles(files, bypassNewUserRestriction) {
return false;
}
- var upload = files[0];
+ const upload = files[0];
// CHROME ONLY: if the image was pasted, sets its name to a default one
if (typeof Blob !== "undefined" && typeof File !== "undefined") {
if (upload instanceof Blob && !(upload instanceof File) && upload.type === "image/png") { upload.name = "blob.png"; }
}
- var type = uploadTypeFromFileName(upload.name);
+ opts = opts || {};
+ opts["type"] = uploadTypeFromFileName(upload.name);
- return validateUploadedFile(upload, type, bypassNewUserRestriction);
+ return validateUploadedFile(upload, opts);
}
-export function validateUploadedFile(file, type, bypassNewUserRestriction) {
+export function validateUploadedFile(file, opts) {
+ opts = opts || {};
+
+ const name = file && file.name;
+
+ if (!name) { return false; }
+
// check that the uploaded file is authorized
- if (!authorizesAllExtensions() &&
- !isAuthorizedUpload(file)) {
- var extensions = authorizedExtensions();
- bootbox.alert(I18n.t('post.errors.upload_not_authorized', { authorized_extensions: extensions }));
- return false;
+ if (opts["imagesOnly"]) {
+ if (!isAnImage(name) && !isAuthorizedImage(name)) {
+ bootbox.alert(I18n.t('post.errors.upload_not_authorized', { authorized_extensions: authorizedImagesExtensions() }));
+ return false;
+ }
+ } else {
+ if (!authorizesAllExtensions() && !isAuthorizedFile(name)) {
+ bootbox.alert(I18n.t('post.errors.upload_not_authorized', { authorized_extensions: authorizedExtensions() }));
+ return false;
+ }
}
- if (!bypassNewUserRestriction) {
+ if (!opts["bypassNewUserRestriction"]) {
// ensures that new users can upload a file
- if (!Discourse.User.current().isAllowedToUploadAFile(type)) {
- bootbox.alert(I18n.t('post.errors.' + type + '_upload_not_allowed_for_new_user'));
+ if (!Discourse.User.current().isAllowedToUploadAFile(opts["type"])) {
+ bootbox.alert(I18n.t(`post.errors.${opts["type"]}_upload_not_allowed_for_new_user`));
return false;
}
}
@@ -196,31 +211,62 @@ export function validateUploadedFile(file, type, bypassNewUserRestriction) {
return true;
}
-export function uploadTypeFromFileName(fileName) {
- return isAnImage(fileName) ? 'image' : 'attachment';
+const IMAGES_EXTENSIONS_REGEX = /(png|jpe?g|gif|bmp|tiff?|svg|webp|ico)/i;
+
+function extensions() {
+ return Discourse.SiteSettings.authorized_extensions
+ .toLowerCase()
+ .replace(/[\s\.]+/g, "")
+ .split("|")
+ .filter(ext => ext.indexOf("*") === -1);
+}
+
+function imagesExtensions() {
+ return extensions().filter(ext => IMAGES_EXTENSIONS_REGEX.test(ext));
+}
+
+function extensionsRegex() {
+ return new RegExp("\\.(" + extensions().join("|") + ")$", "i");
+}
+
+function imagesExtensionsRegex() {
+ return new RegExp("\\.(" + imagesExtensions().join("|") + ")$", "i");
+}
+
+function isAuthorizedFile(fileName) {
+ return extensionsRegex().test(fileName);
+}
+
+function isAuthorizedImage(fileName){
+ return imagesExtensionsRegex().test(fileName);
+}
+
+export function authorizedExtensions() {
+ return authorizesAllExtensions() ? "*" : extensions().join(", ");
+}
+
+export function authorizedImagesExtensions() {
+ return authorizesAllExtensions() ? "png, jpg, jpeg, gif, bmp, tiff, svg, webp, ico" : imagesExtensions().join(", ");
}
export function authorizesAllExtensions() {
return Discourse.SiteSettings.authorized_extensions.indexOf("*") >= 0;
}
-export function isAuthorizedUpload(file) {
- if (file && file.name) {
- var extensions = _.chain(Discourse.SiteSettings.authorized_extensions.split("|"))
- .reject(function(extension) { return extension.indexOf("*") >= 0; })
- .map(function(extension) { return (extension.indexOf(".") === 0 ? extension.substring(1) : extension).replace(".", "\\."); })
- .value();
- return new RegExp("\\.(" + extensions.join("|") + ")$", "i").test(file.name);
- }
- return false;
+export function isAnImage(path) {
+ return (/\.(png|jpe?g|gif|bmp|tiff?|svg|webp|ico)$/i).test(path);
}
-export function authorizedExtensions() {
- return _.chain(Discourse.SiteSettings.authorized_extensions.split("|"))
- .reject(function(extension) { return extension.indexOf("*") >= 0; })
- .map(function(extension) { return extension.toLowerCase(); })
- .value()
- .join(", ");
+function uploadTypeFromFileName(fileName) {
+ return isAnImage(fileName) ? 'image' : 'attachment';
+}
+
+export function allowsImages() {
+ return authorizesAllExtensions() || IMAGES_EXTENSIONS_REGEX.test(authorizedExtensions());
+}
+
+export function allowsAttachments() {
+ return authorizesAllExtensions() || extensions().length > imagesExtensions().length;
}
export function uploadLocation(url) {
@@ -232,7 +278,7 @@ export function uploadLocation(url) {
} else {
var protocol = window.location.protocol + '//',
hostname = window.location.hostname,
- port = ':' + window.location.port;
+ port = window.location.port ? ':' + window.location.port : '';
return protocol + hostname + port + url;
}
}
@@ -241,27 +287,12 @@ export function getUploadMarkdown(upload) {
if (isAnImage(upload.original_filename)) {
return '
';
} else if (!Discourse.SiteSettings.prevent_anons_from_downloading_files && (/\.(mov|mp4|webm|ogv|mp3|ogg|wav|m4a)$/i).test(upload.original_filename)) {
- // is Audio/Video
return uploadLocation(upload.url);
} else {
return '' + upload.original_filename + ' (' + I18n.toHumanSize(upload.filesize) + ')\n';
}
}
-export function isAnImage(path) {
- return (/\.(png|jpe?g|gif|bmp|tiff?|svg|webp|ico)$/i).test(path);
-}
-
-export function allowsImages() {
- return authorizesAllExtensions() ||
- (/(png|jpe?g|gif|bmp|tiff?|svg|webp|ico)/i).test(authorizedExtensions());
-}
-
-export function allowsAttachments() {
- return authorizesAllExtensions() ||
- !(/((png|jpe?g|gif|bmp|tiff?|svg|web|ico)(,\s)?)+$/i).test(authorizedExtensions());
-}
-
export function displayErrorForUpload(data) {
// deal with meaningful errors first
if (data.jqXHR) {
@@ -298,5 +329,35 @@ export function defaultHomepage() {
return Discourse.SiteSettings.top_menu.split("|")[0].split(",")[0];
}
+export function determinePostReplaceSelection({ selection, needle, replacement }) {
+ const diff = (replacement.end - replacement.start) - (needle.end - needle.start);
+
+ if (selection.end <= needle.start) {
+ // Selection ends (and starts) before needle.
+ return { start: selection.start, end: selection.end };
+ } else if (selection.start <= needle.start) {
+ // Selection starts before needle...
+ if (selection.end < needle.end) {
+ // ... and ends inside needle.
+ return { start: selection.start, end: needle.start };
+ } else {
+ // ... and spans needle completely.
+ return { start: selection.start, end: selection.end + diff };
+ }
+ } else if (selection.start < needle.end) {
+ // Selection starts inside needle...
+ if (selection.end <= needle.end) {
+ // ... and ends inside needle.
+ return { start: replacement.end, end: replacement.end };
+ } else {
+ // ... and spans end of needle.
+ return { start: replacement.end, end: selection.end + diff };
+ }
+ } else {
+ // Selection starts (and ends) behind needle.
+ return { start: selection.start + diff, end: selection.end + diff };
+ }
+}
+
// This prevents a mini racer crash
export default {};
diff --git a/app/assets/javascripts/discourse/mapping-router.js.es6 b/app/assets/javascripts/discourse/mapping-router.js.es6
new file mode 100644
index 00000000000..e88b7f746d3
--- /dev/null
+++ b/app/assets/javascripts/discourse/mapping-router.js.es6
@@ -0,0 +1,142 @@
+import { defaultHomepage } from 'discourse/lib/utilities';
+const rootURL = Discourse.BaseUri;
+
+const BareRouter = Ember.Router.extend({
+ rootURL,
+ location: Ember.testing ? 'none': 'discourse-location',
+
+ handleURL(url) {
+ const params = url.split('?');
+
+ if (params[0] === "/") {
+ url = defaultHomepage();
+ if (params[1] && params[1].length) {
+ url = `${url}?${params[1]}`;
+ }
+ }
+ return this._super(url);
+ }
+});
+
+// Ember's router can't be extended. We need to allow plugins to add routes to routes that were defined
+// in the core app. This class has the same API as Ember's `Router.map` but saves the results in a tree.
+// The tree is applied after all plugins are defined.
+class RouteNode {
+ constructor(name, opts={}, depth=0) {
+ this.name = name;
+ this.opts = opts;
+ this.depth = depth;
+ this.children = [];
+ this.childrenByName = {};
+ this.paths = {};
+
+ if (!opts.path) {
+ opts.path = name;
+ }
+
+ this.paths[opts.path] = true;
+ }
+
+ route(name, opts, fn) {
+ if (typeof opts === 'function') {
+ fn = opts;
+ opts = {};
+ } else {
+ opts = opts || {};
+ }
+
+ const existing = this.childrenByName[name];
+ if (existing) {
+ if (opts.path) {
+ existing.paths[opts.path] = true;
+ }
+ existing.extract(fn);
+ } else {
+ const node = new RouteNode(name, opts, this.depth+1);
+ node.extract(fn);
+ this.childrenByName[name] = node;
+ this.children.push(node);
+ }
+ }
+
+ extract(fn) {
+ if (!fn) { return; }
+ fn.call(this);
+ }
+
+ mapRoutes(router) {
+ const children = this.children;
+ if (this.name === 'root') {
+ children.forEach(c => c.mapRoutes(router));
+ } else {
+
+ const builder = (children.length === 0) ? undefined : function() {
+ children.forEach(c => c.mapRoutes(this));
+ };
+ router.route(this.name, this.opts, builder);
+
+ // We can have multiple paths to the same route
+ const paths = Object.keys(this.paths);
+ if (paths.length > 1) {
+ paths.filter(p => p !== this.opts.path).forEach(path => {
+ const newOpts = jQuery.extend({}, this.opts, { path });
+ console.log(`warning: we can't have duplicate route names anymore`, newOpts);
+ // router.route(this.name, newOpts, builder);
+ });
+ }
+ }
+ }
+
+ findSegment(segments) {
+ if (segments && segments.length) {
+ const first = segments.shift();
+ const node = this.childrenByName[first];
+ if (node) {
+ return (segments.length === 0) ? node : node.findSegment(segments);
+ }
+ }
+ }
+
+ findPath(path) {
+ if (path) {
+ return this.findSegment(path.split('.'));
+ }
+ }
+}
+
+export function mapRoutes() {
+ const tree = new RouteNode('root');
+ const extras = [];
+
+ // If a module is defined as `route-map` in discourse or a plugin, its routes
+ // will be built automatically. You can supply a `resource` property to
+ // automatically put it in that resource, such as `admin`. That way plugins
+ // can define admin routes.
+ Object.keys(requirejs._eak_seen).forEach(function(key) {
+ if (/route-map$/.test(key)) {
+ var module = require(key, null, null, true);
+ if (!module || !module.default) { throw new Error(key + ' must export a route map.'); }
+
+ const mapObj = module.default;
+ if (typeof mapObj === 'function') {
+ tree.extract(mapObj);
+ } else {
+ extras.push(mapObj);
+ }
+ }
+ });
+
+ extras.forEach(extra => {
+ const node = tree.findPath(extra.resource);
+ if (node) {
+ node.extract(extra.map);
+ }
+ });
+
+ return BareRouter.extend().map(function() {
+ tree.mapRoutes(this);
+ this.route('unknown', {path: '*path'});
+ });
+}
+
+export default BareRouter;
diff --git a/app/assets/javascripts/discourse/mixins/add-category-class.js.es6 b/app/assets/javascripts/discourse/mixins/add-category-class.js.es6
deleted file mode 100644
index b3496ee8cbf..00000000000
--- a/app/assets/javascripts/discourse/mixins/add-category-class.js.es6
+++ /dev/null
@@ -1,27 +0,0 @@
-// Mix this in to a view that has a `categoryFullSlug` property to automatically
-// add it to the body as the view is entered / left / model is changed.
-// This is used for keeping the `body` style in sync for the background image.
-
-import Ember from "ember";
-const { on, observer } = Ember;
-
-export default {
- _categoryChanged: on("didInsertElement", observer("categoryFullSlug", function() {
- const categoryFullSlug = this.get("categoryFullSlug");
-
- this._removeClass();
-
- if (categoryFullSlug) {
- $("body").addClass("category-" + categoryFullSlug);
- }
- })),
-
- _leave: on("willDestroyElement", function() {
- this.removeObserver("categoryFullSlug");
- this._removeClass();
- }),
-
- _removeClass() {
- $("body").removeClass((_, css) => (css.match(/\bcategory-\S+/g) || []).join(" "));
- },
-};
diff --git a/app/assets/javascripts/discourse/mixins/delegate-actions.js.es6 b/app/assets/javascripts/discourse/mixins/delegate-actions.js.es6
deleted file mode 100644
index ce3e46a56f5..00000000000
--- a/app/assets/javascripts/discourse/mixins/delegate-actions.js.es6
+++ /dev/null
@@ -1,6 +0,0 @@
-export default Ember.Mixin.create({
- init() {
- this._super();
- (this.get('delegated') || []).forEach(m => this.set(m, m));
- },
-});
diff --git a/app/assets/javascripts/discourse/mixins/load-more.js.es6 b/app/assets/javascripts/discourse/mixins/load-more.js.es6
index c422e1cd633..d83725f790b 100644
--- a/app/assets/javascripts/discourse/mixins/load-more.js.es6
+++ b/app/assets/javascripts/discourse/mixins/load-more.js.es6
@@ -3,7 +3,7 @@ import Scrolling from 'discourse/mixins/scrolling';
import { on } from 'ember-addons/ember-computed-decorators';
// Provides the ability to load more items for a view which is scrolled to the bottom.
-export default Ember.Mixin.create(Ember.ViewTargetActionSupport, Scrolling, {
+export default Ember.Mixin.create(Scrolling, {
scrolled() {
const eyeline = this.get('eyeline');
diff --git a/app/assets/javascripts/discourse/mixins/modal-functionality.js.es6 b/app/assets/javascripts/discourse/mixins/modal-functionality.js.es6
index 42a279b8036..23bc790e153 100644
--- a/app/assets/javascripts/discourse/mixins/modal-functionality.js.es6
+++ b/app/assets/javascripts/discourse/mixins/modal-functionality.js.es6
@@ -1,9 +1,5 @@
-export default Em.Mixin.create({
- flashMessage: null,
-
- needs: ['modal'],
-
- flash(message, messageClass) {
- this.set('flashMessage', Em.Object.create({ message, messageClass }));
+export default Ember.Mixin.create({
+ flash(text, messageClass) {
+ this.appEvents.trigger('modal-body:flash', { text, messageClass });
}
});
diff --git a/app/assets/javascripts/discourse/mixins/scroll-top.js.es6 b/app/assets/javascripts/discourse/mixins/scroll-top.js.es6
index 35af1d0eee9..5945c73a600 100644
--- a/app/assets/javascripts/discourse/mixins/scroll-top.js.es6
+++ b/app/assets/javascripts/discourse/mixins/scroll-top.js.es6
@@ -1,14 +1,24 @@
import DiscourseURL from 'discourse/lib/url';
+import { deprecated } from 'discourse/mixins/scroll-top';
+
+const context = {
+ _scrollTop() {
+ if (Ember.testing) { return; }
+ $(document).scrollTop(0);
+ }
+};
function scrollTop() {
if (DiscourseURL.isJumpScheduled()) { return; }
- Ember.run.schedule('afterRender', function() {
- $(document).scrollTop(0);
- });
+ Ember.run.scheduleOnce('afterRender', context, context._scrollTop);
}
export default Ember.Mixin.create({
- _scrollTop: scrollTop.on('didInsertElement')
+ didInsertElement() {
+ deprecated('The `ScrollTop` mixin is deprecated. Replace it with a `{{d-section}}` component');
+ this._super();
+ scrollTop();
+ }
});
export { scrollTop };
diff --git a/app/assets/javascripts/discourse/mixins/string-buffer.js.es6 b/app/assets/javascripts/discourse/mixins/string-buffer.js.es6
deleted file mode 100644
index 943a972c6e4..00000000000
--- a/app/assets/javascripts/discourse/mixins/string-buffer.js.es6
+++ /dev/null
@@ -1,45 +0,0 @@
-export default Ember.Mixin.create({
-
- _watchProps: function() {
- const args = this.get('rerenderTriggers');
- if (!Ember.isNone(args)) {
- args.forEach(k => this.addObserver(k, this.rerenderString));
- }
- }.on('init'),
-
- render(buffer) {
- this.renderString(buffer);
- },
-
- renderString(buffer){
- const template = Discourse.__container__.lookup('template:' + this.rawTemplate);
- if (template) {
- buffer.push(template(this));
- }
- },
-
- _rerenderString() {
- const $sel = this.$();
- if (!$sel) { return; }
-
- const buffer = [];
- this.renderString(buffer);
-
- // Chrome likes scrolling after HTML is set
- // This happens if you navigate back and forth a few times
- // Before removing this code confirm that this does not cause scrolling
- // 1. Sort by views
- // 2. Go to last post on one of the topics
- // 3. Hit back
- // 4. Go to last post on same topic
- // 5. Expand likes
- const scrollTop = $(window).scrollTop();
- $sel.html(buffer.join(''));
- $(window).scrollTop(scrollTop);
- },
-
- rerenderString() {
- Ember.run.once(this, '_rerenderString');
- }
-
-});
diff --git a/app/assets/javascripts/discourse/mixins/upload.js.es6 b/app/assets/javascripts/discourse/mixins/upload.js.es6
index 648d18dfd98..ec76aa1e660 100644
--- a/app/assets/javascripts/discourse/mixins/upload.js.es6
+++ b/app/assets/javascripts/discourse/mixins/upload.js.es6
@@ -8,6 +8,10 @@ export default Em.Mixin.create({
Em.warn("You should implement `uploadDone`");
},
+ validateUploadedFilesOptions() {
+ return {};
+ },
+
_initialize: function() {
const $upload = this.$(),
csrf = Discourse.Session.currentProp("csrfToken"),
@@ -40,7 +44,8 @@ export default Em.Mixin.create({
});
$upload.on("fileuploadsubmit", (e, data) => {
- const isValid = validateUploadedFiles(data.files, true);
+ const opts = _.merge({ bypassNewUserRestriction: true }, this.validateUploadedFilesOptions());
+ const isValid = validateUploadedFiles(data.files, opts);
let form = { type: this.get("type") };
if (this.get("data")) { form = $.extend(form, this.get("data")); }
data.formData = form;
diff --git a/app/assets/javascripts/discourse/models/admin-post.js.es6 b/app/assets/javascripts/discourse/models/admin-post.js.es6
index 4504fcbe24e..8de331ac955 100644
--- a/app/assets/javascripts/discourse/models/admin-post.js.es6
+++ b/app/assets/javascripts/discourse/models/admin-post.js.es6
@@ -9,7 +9,7 @@ export default Post.extend({
}
}.on("init"),
- presentName: Em.computed.any('name', 'username'),
+ presentName: Ember.computed.or('name', 'username'),
sameUser: function() {
return this.get("username") === Discourse.User.currentProp("username");
diff --git a/app/assets/javascripts/discourse/models/badge.js.es6 b/app/assets/javascripts/discourse/models/badge.js.es6
index 333b40c57ff..f94b6576696 100644
--- a/app/assets/javascripts/discourse/models/badge.js.es6
+++ b/app/assets/javascripts/discourse/models/badge.js.es6
@@ -135,7 +135,7 @@ Badge.reopenClass({
if(opts && opts.onlyListable){
listable = "?only_listable=true";
}
- return ajax('/badges.json' + listable).then(function(badgesJson) {
+ return ajax('/badges.json' + listable, { data: opts }).then(function(badgesJson) {
return Badge.createFromJson(badgesJson);
});
},
diff --git a/app/assets/javascripts/discourse/models/category-list.js.es6 b/app/assets/javascripts/discourse/models/category-list.js.es6
index c1469c314d7..987e5020530 100644
--- a/app/assets/javascripts/discourse/models/category-list.js.es6
+++ b/app/assets/javascripts/discourse/models/category-list.js.es6
@@ -11,9 +11,19 @@ const CategoryList = Ember.ArrayProxy.extend({
CategoryList.reopenClass({
categoriesFrom(store, result) {
const categories = CategoryList.create();
- const users = Discourse.Model.extractByKey(result.featured_users, Discourse.User);
const list = Discourse.Category.list();
+ let statPeriod = "all";
+ const minCategories = result.category_list.categories.length * 0.66;
+
+ ["week", "month"].some(period => {
+ const filteredCategories = result.category_list.categories.filter(c => c[`topics_${period}`] > 0);
+ if (filteredCategories.length >= minCategories) {
+ statPeriod = period;
+ return true;
+ }
+ });
+
result.category_list.categories.forEach(c => {
if (c.parent_category_id) {
c.parentCategory = list.findBy('id', c.parent_category_id);
@@ -23,14 +33,29 @@ CategoryList.reopenClass({
c.subcategories = c.subcategory_ids.map(scid => list.findBy('id', parseInt(scid, 10)));
}
- if (c.featured_user_ids) {
- c.featured_users = c.featured_user_ids.map(u => users[u]);
- }
-
if (c.topics) {
c.topics = c.topics.map(t => Discourse.Topic.create(t));
}
+
+ switch(statPeriod) {
+ case "week":
+ case "month":
+ const stat = c[`topics_${statPeriod}`];
+ const unit = I18n.t(statPeriod);
+ if (stat > 0) {
+ c.stat = `${stat} / ${unit}`;
+ c.statTitle = I18n.t("categories.topic_stat_sentence", { count: stat, unit: unit });
+ c["pick" + statPeriod[0].toUpperCase() + statPeriod.slice(1)] = true;
+ break;
+ }
+ default:
+ c.stat = `${c.topics_all_time}`;
+ c.statTitle = I18n.t("categories.topic_sentence", { count: c.topics_all_time });
+ c.pickAll = true;
+ break;
+ }
+
categories.pushObject(store.createRecord('category', c));
});
return categories;
diff --git a/app/assets/javascripts/discourse/models/category.js.es6 b/app/assets/javascripts/discourse/models/category.js.es6
index 000aeaeccb4..b31f715b810 100644
--- a/app/assets/javascripts/discourse/models/category.js.es6
+++ b/app/assets/javascripts/discourse/models/category.js.es6
@@ -1,5 +1,6 @@
import { ajax } from 'discourse/lib/ajax';
import RestModel from 'discourse/models/rest';
+import computed from 'ember-addons/ember-computed-decorators';
import { on } from 'ember-addons/ember-computed-decorators';
import PermissionType from 'discourse/models/permission-type';
@@ -17,56 +18,64 @@ const Category = RestModel.extend({
availableGroups.removeObject(elem.group_name);
return {
group_name: elem.group_name,
- permission: PermissionType.create({id: elem.permission_type})
+ permission: PermissionType.create({ id: elem.permission_type })
};
}));
}
},
- availablePermissions: function(){
- return [ PermissionType.create({id: PermissionType.FULL}),
- PermissionType.create({id: PermissionType.CREATE_POST}),
- PermissionType.create({id: PermissionType.READONLY})
- ];
- }.property(),
+ @computed
+ availablePermissions() {
+ return [
+ PermissionType.create({ id: PermissionType.FULL }),
+ PermissionType.create({ id: PermissionType.CREATE_POST }),
+ PermissionType.create({ id: PermissionType.READONLY })
+ ];
+ },
- searchContext: function() {
- return ({ type: 'category', id: this.get('id'), category: this });
- }.property('id'),
+ @computed("id")
+ searchContext(id) {
+ return { type: 'category', id, category: this };
+ },
- url: function() {
+ @computed("name")
+ url() {
return Discourse.getURL("/c/") + Category.slugFor(this);
- }.property('name'),
+ },
- fullSlug: function() {
- return this.get("url").slice(3).replace("/", "-");
- }.property("url"),
+ @computed("url")
+ fullSlug(url) {
+ return url.slice(3).replace("/", "-");
+ },
- nameLower: function() {
- return this.get('name').toLowerCase();
- }.property('name'),
+ @computed("name")
+ nameLower(name) {
+ return name.toLowerCase();
+ },
- unreadUrl: function() {
- return this.get('url') + '/l/unread';
- }.property('url'),
+ @computed("url")
+ unreadUrl(url) {
+ return `${url}/l/unread`;
+ },
- newUrl: function() {
- return this.get('url') + '/l/new';
- }.property('url'),
+ @computed("url")
+ newUrl(url) {
+ return `${url}/l/new`;
+ },
- style: function() {
- return "background-color: #" + this.get('category.color') + "; color: #" + this.get('category.text_color') + ";";
- }.property('color', 'text_color'),
+ @computed("color", "text_color")
+ style(color, textColor) {
+ return `background-color: #${color}; color: #${textColor}`;
+ },
- moreTopics: function() {
- return this.get('topic_count') > Discourse.SiteSettings.category_featured_topics;
- }.property('topic_count'),
+ @computed("topic_count")
+ moreTopics(topicCount) {
+ return topicCount > Discourse.SiteSettings.category_featured_topics;
+ },
- save: function() {
- var url = "/categories";
- if (this.get('id')) {
- url = "/categories/" + this.get('id');
- }
+ save() {
+ const id = this.get("id");
+ const url = id ? `/categories/${id}` : "/categories";
return ajax(url, {
data: {
@@ -82,120 +91,87 @@ const Category = RestModel.extend({
email_in: this.get('email_in'),
email_in_allow_strangers: this.get('email_in_allow_strangers'),
parent_category_id: this.get('parent_category_id'),
- logo_url: this.get('logo_url'),
- background_url: this.get('background_url'),
+ uploaded_logo_id: this.get('uploaded_logo.id'),
+ uploaded_background_id: this.get('uploaded_background.id'),
allow_badges: this.get('allow_badges'),
custom_fields: this.get('custom_fields'),
topic_template: this.get('topic_template'),
suppress_from_homepage: this.get('suppress_from_homepage'),
+ all_topics_wiki: this.get('all_topics_wiki'),
allowed_tags: this.get('allowed_tags'),
- allowed_tag_groups: this.get('allowed_tag_groups')
+ allowed_tag_groups: this.get('allowed_tag_groups'),
+ sort_order: this.get('sort_order'),
+ sort_ascending: this.get('sort_ascending'),
+ topic_featured_link_allowed: this.get('topic_featured_link_allowed')
},
- type: this.get('id') ? 'PUT' : 'POST'
+ type: id ? 'PUT' : 'POST'
});
},
- permissionsForUpdate: function(){
- var rval = {};
- _.each(this.get("permissions"),function(p){
- rval[p.group_name] = p.permission.id;
- });
+ @computed("permissions")
+ permissionsForUpdate(permissions) {
+ let rval = {};
+ permissions.forEach(p => rval[p.group_name] = p.permission.id);
return rval;
- }.property("permissions"),
-
- destroy: function() {
- return ajax("/categories/" + (this.get('id') || this.get('slug')), { type: 'DELETE' });
},
- addPermission: function(permission){
+ destroy() {
+ return ajax(`/categories/${this.get('id') || this.get('slug')}`, { type: 'DELETE' });
+ },
+
+ addPermission(permission) {
this.get("permissions").addObject(permission);
this.get("availableGroups").removeObject(permission.group_name);
},
-
- removePermission: function(permission){
+ removePermission(permission) {
this.get("permissions").removeObject(permission);
this.get("availableGroups").addObject(permission.group_name);
},
- permissions: function(){
+ @computed
+ permissions() {
return Em.A([
- {group_name: "everyone", permission: PermissionType.create({id: 1})},
- {group_name: "admins", permission: PermissionType.create({id: 2}) },
- {group_name: "crap", permission: PermissionType.create({id: 3}) }
+ { group_name: "everyone", permission: PermissionType.create({id: 1}) },
+ { group_name: "admins", permission: PermissionType.create({id: 2}) },
+ { group_name: "crap", permission: PermissionType.create({id: 3}) }
]);
- }.property(),
+ },
- latestTopic: function(){
- var topics = this.get('topics');
+ @computed("topics")
+ latestTopic(topics) {
if (topics && topics.length) {
return topics[0];
}
- }.property("topics"),
+ },
- featuredTopics: function() {
- var topics = this.get('topics');
+ @computed("topics")
+ featuredTopics(topics) {
if (topics && topics.length) {
return topics.slice(0, Discourse.SiteSettings.category_featured_topics || 2);
}
- }.property('topics'),
+ },
- unreadTopics: function() {
- return this.topicTrackingState.countUnread(this.get('id'));
- }.property('topicTrackingState.messageCount'),
+ @computed("id", "topicTrackingState.messageCount")
+ unreadTopics(id) {
+ return this.topicTrackingState.countUnread(id);
+ },
- newTopics: function() {
- return this.topicTrackingState.countNew(this.get('id'));
- }.property('topicTrackingState.messageCount'),
+ @computed("id", "topicTrackingState.messageCount")
+ newTopics(id) {
+ return this.topicTrackingState.countNew(id);
+ },
- topicStatsTitle: function() {
- var string = I18n.t('categories.topic_stats');
- _.each(this.get('topicCountStats'), function(stat) {
- string += ' ' + I18n.t('categories.topic_stat_sentence', {count: stat.value, unit: stat.unit});
- }, this);
- return string;
- }.property('post_count'),
-
- postStatsTitle: function() {
- var string = I18n.t('categories.post_stats');
- _.each(this.get('postCountStats'), function(stat) {
- string += ' ' + I18n.t('categories.post_stat_sentence', {count: stat.value, unit: stat.unit});
- }, this);
- return string;
- }.property('post_count'),
-
- topicCountStats: function() {
- return this.countStats('topics');
- }.property('topics_year', 'topics_month', 'topics_week', 'topics_day'),
-
- setNotification: function(notification_level) {
- var url = "/category/" + this.get('id')+"/notifications";
+ setNotification(notification_level) {
this.set('notification_level', notification_level);
- return ajax(url, {
- data: {
- notification_level: notification_level
- },
- type: 'POST'
- });
+ const url = `/category/${this.get('id')}/notifications`;
+ return ajax(url, { data: { notification_level }, type: 'POST' });
},
- postCountStats: function() {
- return this.countStats('posts');
- }.property('posts_year', 'posts_month', 'posts_week', 'posts_day'),
-
- countStats: function(prefix) {
- var stats = [], val;
- _.each(['day', 'week', 'month', 'year'], function(unit) {
- val = this.get(prefix + '_' + unit);
- if (val > 0) stats.pushObject({value: val, unit: I18n.t(unit)});
- if (stats.length === 2) return false;
- }, this);
- return stats;
- },
-
- isUncategorizedCategory: function() {
- return this.get('id') === Discourse.Site.currentProp("uncategorized_category_id");
- }.property('id')
+ @computed("id")
+ isUncategorizedCategory(id) {
+ return id === Discourse.Site.currentProp("uncategorized_category_id");
+ }
});
var _uncategorized;
diff --git a/app/assets/javascripts/discourse/models/composer.js.es6 b/app/assets/javascripts/discourse/models/composer.js.es6
index 738ec9d9585..bb833c7c1c7 100644
--- a/app/assets/javascripts/discourse/models/composer.js.es6
+++ b/app/assets/javascripts/discourse/models/composer.js.es6
@@ -5,6 +5,7 @@ import Quote from 'discourse/lib/quote';
import Draft from 'discourse/models/draft';
import computed from 'ember-addons/ember-computed-decorators';
import { escapeExpression, tinyAvatar } from 'discourse/lib/utilities';
+import { emojiUnescape } from 'discourse/lib/text';
const CLOSED = 'closed',
SAVING = 'saving',
@@ -31,13 +32,15 @@ const CLOSED = 'closed',
target_usernames: 'targetUsernames',
typing_duration_msecs: 'typingTime',
composer_open_duration_msecs: 'composerTime',
- tags: 'tags'
+ tags: 'tags',
+ featured_link: 'featuredLink'
},
_edit_topic_serializer = {
title: 'topic.title',
categoryId: 'topic.category.id',
- tags: 'topic.tags'
+ tags: 'topic.tags',
+ featuredLink: 'topic.featured_link'
};
const Composer = RestModel.extend({
@@ -118,7 +121,7 @@ const Composer = RestModel.extend({
}.property().volatile(),
archetype: function() {
- return this.get('archetypes').findProperty('id', this.get('archetypeId'));
+ return this.get('archetypes').findBy('id', this.get('archetypeId'));
}.property('archetypeId'),
archetypeChanged: function() {
@@ -135,6 +138,21 @@ const Composer = RestModel.extend({
canEditTitle: Em.computed.or('creatingTopic', 'creatingPrivateMessage', 'editingFirstPost'),
canCategorize: Em.computed.and('canEditTitle', 'notCreatingPrivateMessage'),
+ @computed('canEditTitle', 'creatingPrivateMessage', 'categoryId')
+ canEditTopicFeaturedLink(canEditTitle, creatingPrivateMessage, categoryId) {
+ if (!this.siteSettings.topic_featured_link_enabled || !canEditTitle || creatingPrivateMessage) { return false; }
+
+ const categoryIds = this.site.get('topic_featured_link_allowed_category_ids');
+ if (!categoryId && categoryIds &&
+ (categoryIds.indexOf(this.site.get('uncategorized_category_id')) !== -1 || !this.siteSettings.allow_uncategorized_topics)) { return true; }
+ return categoryIds === undefined || !categoryIds.length || categoryIds.indexOf(categoryId) !== -1;
+ },
+
+ @computed('canEditTopicFeaturedLink')
+ titlePlaceholder() {
+ return this.get('canEditTopicFeaturedLink') ? 'composer.title_or_link_placeholder' : 'composer.title_placeholder';
+ },
+
// Determine the appropriate title for this action
actionTitle: function() {
const topic = this.get('topic');
@@ -174,12 +192,11 @@ const Composer = RestModel.extend({
case REPLY:
case EDIT:
if (postDescription) return postDescription;
- if (topic) return I18n.t('post.reply_topic', { link: topicLink });
+ if (topic) return emojiUnescape(I18n.t('post.reply_topic', { link: topicLink }));
}
}.property('action', 'post', 'topic', 'topic.title'),
-
// whether to disable the post button
cantSubmitPost: function() {
@@ -268,11 +285,12 @@ const Composer = RestModel.extend({
}
}.property('privateMessage'),
- missingReplyCharacters: function() {
- const postType = this.get('post.post_type');
- if (postType === this.site.get('post_types.small_action')) { return 0; }
- return this.get('minimumPostLength') - this.get('replyLength');
- }.property('minimumPostLength', 'replyLength'),
+ @computed('minimumPostLength', 'replyLength', 'canEditTopicFeaturedLink')
+ missingReplyCharacters(minimumPostLength, replyLength, canEditTopicFeaturedLink) {
+ if (this.get('post.post_type') === this.site.get('post_types.small_action') ||
+ canEditTopicFeaturedLink && this.get('featuredLink')) { return 0; }
+ return minimumPostLength - replyLength;
+ },
/**
Minimum number of characters for a post body to be valid.
@@ -378,14 +396,14 @@ const Composer = RestModel.extend({
// If the user didn't change the template, clear it
if (oldCategoryId) {
- const oldCat = this.site.categories.findProperty('id', oldCategoryId);
+ const oldCat = this.site.categories.findBy('id', oldCategoryId);
if (oldCat && (oldCat.get('topic_template') === reply)) {
reply = "";
}
}
if (!Ember.isEmpty(reply)) { return; }
- const category = this.site.categories.findProperty('id', categoryId);
+ const category = this.site.categories.findBy('id', categoryId);
if (category) {
this.set('reply', category.get('topic_template') || "");
}
@@ -491,6 +509,12 @@ const Composer = RestModel.extend({
save(opts) {
if (!this.get('cantSubmitPost')) {
+
+ // change category may result in some effect for topic featured link
+ if (!this.get('canEditTopicFeaturedLink')) {
+ this.set('featuredLink', null);
+ }
+
return this.get('editingPost') ? this.editPost(opts) : this.createPost(opts);
}
},
@@ -511,7 +535,8 @@ const Composer = RestModel.extend({
stagedPost: false,
typingTime: 0,
composerOpened: null,
- composerTotalOpened: 0
+ composerTotalOpened: 0,
+ featuredLink: null
});
},
@@ -529,8 +554,7 @@ const Composer = RestModel.extend({
post.get('post_number') === 1 &&
this.get('topic.details.can_edit')) {
const topicProps = this.getProperties(Object.keys(_edit_topic_serializer));
-
- promise = Topic.update(this.get('topic'), topicProps);
+ promise = Topic.update(this.get('topic'), topicProps);
} else {
promise = Ember.RSVP.resolve();
}
@@ -651,6 +675,11 @@ const Composer = RestModel.extend({
return result;
}
+ // We sometimes want to hide the `reply_to_user` if the post contains a quote
+ if (result.responseJson && result.responseJson.post && !result.responseJson.post.reply_to_user) {
+ createdPost.set('reply_to_user', null);
+ }
+
if (topic) {
// It's no longer a new post
topic.set('draft_sequence', result.target.draft_sequence);
@@ -680,6 +709,10 @@ const Composer = RestModel.extend({
}).catch(throwAjaxError(function() {
if (postStream) {
postStream.undoPost(createdPost);
+
+ if (post) {
+ post.set('reply_count', post.get('reply_count') - 1);
+ }
}
Ember.run.next(() => composer.set('composeState', OPEN));
}));
diff --git a/app/assets/javascripts/discourse/models/group-history.js.es6 b/app/assets/javascripts/discourse/models/group-history.js.es6
new file mode 100644
index 00000000000..18b644d163c
--- /dev/null
+++ b/app/assets/javascripts/discourse/models/group-history.js.es6
@@ -0,0 +1,9 @@
+import computed from 'ember-addons/ember-computed-decorators';
+import RestModel from 'discourse/models/rest';
+
+export default RestModel.extend({
+ @computed('action')
+ actionTitle(action) {
+ return I18n.t(`group_histories.actions.${action}`);
+ }
+});
diff --git a/app/assets/javascripts/discourse/models/group.js.es6 b/app/assets/javascripts/discourse/models/group.js.es6
index b6890e82631..99c95caf61a 100644
--- a/app/assets/javascripts/discourse/models/group.js.es6
+++ b/app/assets/javascripts/discourse/models/group.js.es6
@@ -1,7 +1,10 @@
import { ajax } from 'discourse/lib/ajax';
-import computed from "ember-addons/ember-computed-decorators";
+import { default as computed, observes } from "ember-addons/ember-computed-decorators";
+import GroupHistory from 'discourse/models/group-history';
+import RestModel from 'discourse/models/rest';
+import { popupAjaxError } from 'discourse/lib/ajax-error';
-const Group = Discourse.Model.extend({
+const Group = RestModel.extend({
limit: 50,
offset: 0,
user_count: 0,
@@ -24,12 +27,12 @@ const Group = Discourse.Model.extend({
if (userCount > 0) { return userCount; }
},
- findMembers() {
+ findMembers(params) {
if (Em.isEmpty(this.get('name'))) { return ; }
const self = this, offset = Math.min(this.get("user_count"), Math.max(this.get("offset"), 0));
- return Group.loadMembers(this.get("name"), offset, this.get("limit")).then(function (result) {
+ return Group.loadMembers(this.get("name"), offset, this.get("limit"), params).then(function (result) {
var ownerIds = {};
result.owners.forEach(owner => ownerIds[owner.id] = true);
@@ -90,6 +93,33 @@ const Group = Discourse.Model.extend({
});
},
+ @computed('flair_bg_color')
+ flairBackgroundHexColor() {
+ return this.get('flair_bg_color') ? this.get('flair_bg_color').replace(new RegExp("[^0-9a-fA-F]", "g"), "") : null;
+ },
+
+ @computed('flair_color')
+ flairHexColor() {
+ return this.get('flair_color') ? this.get('flair_color').replace(new RegExp("[^0-9a-fA-F]", "g"), "") : null;
+ },
+
+ @computed('alias_level')
+ canEveryoneMention(aliasLevel) {
+ return aliasLevel === '99';
+ },
+
+ @observes("visible", "canEveryoneMention")
+ _updateAllowMembershipRequests() {
+ if (!this.get('visible') || !this.get('canEveryoneMention')) {
+ this.set ('allow_membership_requests', false);
+ }
+ },
+
+ @observes("visible")
+ _updatePublic() {
+ if (!this.get('visible')) this.set('public', false);
+ },
+
asJSON() {
return {
name: this.get('name'),
@@ -101,18 +131,31 @@ const Group = Discourse.Model.extend({
primary_group: !!this.get('primary_group'),
grant_trust_level: this.get('grant_trust_level'),
incoming_email: this.get("incoming_email"),
+ flair_url: this.get('flair_url'),
+ flair_bg_color: this.get('flairBackgroundHexColor'),
+ flair_color: this.get('flairHexColor'),
+ bio_raw: this.get('bio_raw'),
+ public: this.get('public'),
+ allow_membership_requests: this.get('allow_membership_requests'),
+ full_name: this.get('full_name')
};
},
create() {
var self = this;
- return ajax("/admin/groups", { type: "POST", data: this.asJSON() }).then(function(resp) {
+ return ajax("/admin/groups", { type: "POST", data: { group: this.asJSON() } }).then(function(resp) {
self.set('id', resp.basic_group.id);
});
},
save() {
- return ajax("/admin/groups/" + this.get('id'), { type: "PUT", data: this.asJSON() });
+ const id = this.get('id');
+ const url = this.get('is_group_owner') ? `/groups/${id}` : `/admin/groups/${id}`;
+
+ return ajax(url, {
+ type: "PUT",
+ data: { group: this.asJSON() }
+ });
},
destroy() {
@@ -120,6 +163,15 @@ const Group = Discourse.Model.extend({
return ajax("/admin/groups/" + this.get('id'), { type: "DELETE" });
},
+ findLogs(offset, filters) {
+ return ajax(`/groups/${this.get('name')}/logs.json`, { data: { offset, filters } }).then(results => {
+ return Ember.Object.create({
+ logs: results["logs"].map(log => GroupHistory.create(log)),
+ all_loaded: results["all_loaded"]
+ });
+ });
+ },
+
findPosts(opts) {
opts = opts || {};
@@ -138,12 +190,12 @@ const Group = Discourse.Model.extend({
},
setNotification(notification_level) {
- this.set("notification_level", notification_level);
+ this.set("group_user.notification_level", notification_level);
return ajax(`/groups/${this.get("name")}/notifications`, {
data: { notification_level },
type: "POST"
});
- },
+ }
});
Group.reopenClass({
@@ -153,22 +205,26 @@ Group.reopenClass({
});
},
- findGroupCounts(name) {
- return ajax("/groups/" + name + "/counts.json").then(result => Em.Object.create(result.counts));
- },
-
find(name) {
return ajax("/groups/" + name + ".json").then(result => Group.create(result.basic_group));
},
- loadMembers(name, offset, limit) {
+ loadOwners(name) {
+ return ajax('/groups/' + name + '/owners.json').catch(popupAjaxError);
+ },
+
+ loadMembers(name, offset, limit, params) {
return ajax('/groups/' + name + '/members.json', {
- data: {
+ data: _.extend({
limit: limit || 50,
offset: offset || 0
- }
+ }, params || {})
});
- }
+ },
+
+ mentionable(name) {
+ return ajax(`/groups/${name}/mentionable`, { data: { name } });
+ },
});
export default Group;
diff --git a/app/assets/javascripts/discourse/models/login-method.js.es6 b/app/assets/javascripts/discourse/models/login-method.js.es6
index 254c401cf94..c125e7bd831 100644
--- a/app/assets/javascripts/discourse/models/login-method.js.es6
+++ b/app/assets/javascripts/discourse/models/login-method.js.es6
@@ -22,7 +22,7 @@ const LoginMethod = Ember.Object.extend({
let methods;
let preRegister;
-export function findAll(siteSettings) {
+export function findAll(siteSettings, capabilities, isMobileDevice) {
if (methods) { return methods; }
methods = [];
@@ -34,7 +34,9 @@ export function findAll(siteSettings) {
params.frameWidth = 850;
params.frameHeight = 500;
} else if (name === "facebook") {
- params.frameHeight = 450;
+ params.frameWidth= 580;
+ params.frameHeight = 400;
+ params.displayPopup = true;
}
params.siteSettings = siteSettings;
@@ -55,6 +57,12 @@ export function findAll(siteSettings) {
});
preRegister = undefined;
}
+
+ // On Mobile, Android or iOS always go with full screen
+ if (isMobileDevice || capabilities.isIOS || capabilities.isAndroid) {
+ methods.forEach(m=>m.set("fullScreenLogin", true));
+ }
+
return methods;
}
diff --git a/app/assets/javascripts/discourse/models/nav-item.js.es6 b/app/assets/javascripts/discourse/models/nav-item.js.es6
index 7eb1616485b..d28b6728345 100644
--- a/app/assets/javascripts/discourse/models/nav-item.js.es6
+++ b/app/assets/javascripts/discourse/models/nav-item.js.es6
@@ -29,7 +29,7 @@ const NavItem = Discourse.Model.extend({
categorySlug: function() {
var split = this.get('name').split('/');
if (split[0] === 'category' && split[1]) {
- var cat = Discourse.Site.current().categories.findProperty('nameLower', split[1].toLowerCase());
+ var cat = Discourse.Site.current().categories.findBy('nameLower', split[1].toLowerCase());
return cat ? Discourse.Category.slugFor(cat) : null;
}
return null;
@@ -86,9 +86,9 @@ NavItem.reopenClass({
testName = name.split("/")[0],
anonymous = !Discourse.User.current();
- if (anonymous && !Discourse.Site.currentProp('anonymous_top_menu_items').contains(testName)) return null;
+ if (anonymous && !Discourse.Site.currentProp('anonymous_top_menu_items').includes(testName)) return null;
if (!Discourse.Category.list() && testName === "categories") return null;
- if (!Discourse.Site.currentProp('top_menu_items').contains(testName)) return null;
+ if (!Discourse.Site.currentProp('top_menu_items').includes(testName)) return null;
var args = { name: name, hasIcon: name === "unread" }, extra = null, self = this;
if (opts.category) { args.category = opts.category; }
diff --git a/app/assets/javascripts/discourse/models/post-stream.js.es6 b/app/assets/javascripts/discourse/models/post-stream.js.es6
index a96f0e0248a..32cfa6427f7 100644
--- a/app/assets/javascripts/discourse/models/post-stream.js.es6
+++ b/app/assets/javascripts/discourse/models/post-stream.js.es6
@@ -59,7 +59,7 @@ export default RestModel.extend({
@computed('hasLoadedData', 'firstPostId', 'posts.[]')
firstPostPresent(hasLoadedData, firstPostId) {
if (!hasLoadedData) { return false; }
- return !!this.get('posts').findProperty('id', firstPostId);
+ return !!this.get('posts').findBy('id', firstPostId);
},
firstPostNotLoaded: Ember.computed.not('firstPostPresent'),
@@ -71,7 +71,7 @@ export default RestModel.extend({
if (!hasLoadedData) { return false; }
if (lastPostId === -1) { return true; }
- return !!this.get('posts').findProperty('id', lastPostId);
+ return !!this.get('posts').findBy('id', lastPostId);
},
lastPostNotLoaded: Ember.computed.not('loadedAllPosts'),
@@ -80,11 +80,10 @@ export default RestModel.extend({
Returns a JS Object of current stream filter options. It should match the query
params for the stream.
**/
- @computed('summary', 'show_deleted', 'userFilters.[]')
- streamFilters(summary, showDeleted) {
+ @computed('summary', 'userFilters.[]')
+ streamFilters(summary) {
const result = {};
if (summary) { result.filter = "summary"; }
- if (showDeleted) { result.show_deleted = true; }
const userFilters = this.get('userFilters');
if (!Ember.isEmpty(userFilters)) {
@@ -141,7 +140,6 @@ export default RestModel.extend({
cancelFilter() {
this.set('summary', false);
- this.set('show_deleted', false);
this.get('userFilters').clear();
},
@@ -156,11 +154,6 @@ export default RestModel.extend({
});
},
- toggleDeleted() {
- this.toggleProperty('show_deleted');
- return this.refresh();
- },
-
jumpToSecondVisible() {
const posts = this.get('posts');
if (posts.length > 1) {
@@ -173,10 +166,9 @@ export default RestModel.extend({
toggleParticipant(username) {
const userFilters = this.get('userFilters');
this.set('summary', false);
- this.set('show_deleted', true);
let jump = false;
- if (userFilters.contains(username)) {
+ if (userFilters.includes(username)) {
userFilters.removeObject(username);
} else {
userFilters.addObject(username);
@@ -208,7 +200,7 @@ export default RestModel.extend({
if (opts.forceLoad) {
this.set('loaded', false);
} else {
- const postWeWant = this.get('posts').findProperty('post_number', opts.nearPost);
+ const postWeWant = this.get('posts').findBy('post_number', opts.nearPost);
if (postWeWant) { return Ember.RSVP.resolve(); }
}
@@ -264,7 +256,7 @@ export default RestModel.extend({
return this.findPostsByIds(gap).then(posts => {
posts.forEach(p => {
const stored = this.storePost(p);
- if (!currentPosts.contains(stored)) {
+ if (!currentPosts.includes(stored)) {
currentPosts.insertAt(postIdx++, stored);
}
});
@@ -418,7 +410,7 @@ export default RestModel.extend({
if (stored) {
const posts = this.get('posts');
- if (!posts.contains(stored)) {
+ if (!posts.includes(stored)) {
if (!this.get('loadingBelow')) {
this.get('postsWithPlaceholders').appendPost(() => posts.pushObject(stored));
} else {
@@ -736,6 +728,68 @@ export default RestModel.extend({
});
},
+ backfillExcerpts(streamPosition){
+ this._excerpts = this._excerpts || [];
+ const stream = this.get('stream');
+
+ this._excerpts.loadNext = streamPosition;
+
+ if (this._excerpts.loading) {
+ return this._excerpts.loading.then(()=>{
+ if(!this._excerpts[stream[streamPosition]]) {
+
+ if (this._excerpts.loadNext === streamPosition) {
+ return this.backfillExcerpts(streamPosition);
+ }
+ }
+ });
+ }
+
+
+ let postIds = stream.slice(Math.max(streamPosition-20,0), streamPosition+20);
+
+ for(let i=postIds.length-1;i>=0;i--) {
+ if (this._excerpts[postIds[i]]) {
+ postIds.splice(i,1);
+ }
+ }
+
+ let data = {
+ post_ids: postIds
+ };
+
+ this._excerpts.loading = ajax("/t/" + this.get('topic.id') + "/excerpts.json", {data})
+ .then(excerpts => {
+ excerpts.forEach(obj => {
+ this._excerpts[obj.post_id] = obj;
+ });
+ })
+ .finally(()=>{ this._excerpts.loading = null; });
+
+ return this._excerpts.loading;
+ },
+
+ excerpt(streamPosition){
+
+ const stream = this.get('stream');
+
+ return new Ember.RSVP.Promise((resolve,reject) => {
+
+ let excerpt = this._excerpts && this._excerpts[stream[streamPosition]];
+
+ if(excerpt) {
+ resolve(excerpt);
+ return;
+ }
+
+ this.backfillExcerpts(streamPosition)
+ .then(()=>{
+ resolve(this._excerpts[stream[streamPosition]]);
+ })
+ .catch(e => reject(e));
+ });
+ },
+
indexOf(post) {
return this.get('stream').indexOf(post.get('id'));
},
diff --git a/app/assets/javascripts/discourse/models/post.js.es6 b/app/assets/javascripts/discourse/models/post.js.es6
index 7e96dc3ba11..b15683ca4a4 100644
--- a/app/assets/javascripts/discourse/models/post.js.es6
+++ b/app/assets/javascripts/discourse/models/post.js.es6
@@ -76,7 +76,7 @@ const Post = RestModel.extend({
internalLinks: function() {
if (Ember.isEmpty(this.get('link_counts'))) return null;
- return this.get('link_counts').filterProperty('internal').filterProperty('title');
+ return this.get('link_counts').filterBy('internal').filterBy('title');
}.property('link_counts.@each.internal'),
flagsAvailable: function() {
diff --git a/app/assets/javascripts/discourse/models/site.js.es6 b/app/assets/javascripts/discourse/models/site.js.es6
index eb417c74290..5b421c46bee 100644
--- a/app/assets/javascripts/discourse/models/site.js.es6
+++ b/app/assets/javascripts/discourse/models/site.js.es6
@@ -20,7 +20,7 @@ const Site = RestModel.extend({
flagTypes() {
const postActionTypes = this.get('post_action_types');
if (!postActionTypes) return [];
- return postActionTypes.filterProperty('is_flag', true);
+ return postActionTypes.filterBy('is_flag', true);
},
topicCountDesc: ['topic_count:desc'],
@@ -64,7 +64,7 @@ const Site = RestModel.extend({
removeCategory(id) {
const categories = this.get('categories');
- const existingCategory = categories.findProperty('id', id);
+ const existingCategory = categories.findBy('id', id);
if (existingCategory) {
categories.removeObject(existingCategory);
delete this.get('categoriesById').categoryId;
@@ -74,7 +74,7 @@ const Site = RestModel.extend({
updateCategory(newCategory) {
const categories = this.get('categories');
const categoryId = Em.get(newCategory, 'id');
- const existingCategory = categories.findProperty('id', categoryId);
+ const existingCategory = categories.findBy('id', categoryId);
// Don't update null permissions
if (newCategory.permission === null) { delete newCategory.permission; }
diff --git a/app/assets/javascripts/discourse/models/store.js.es6 b/app/assets/javascripts/discourse/models/store.js.es6
index 1dd6ee2a1f0..753f2dd5abf 100644
--- a/app/assets/javascripts/discourse/models/store.js.es6
+++ b/app/assets/javascripts/discourse/models/store.js.es6
@@ -1,6 +1,7 @@
import { ajax } from 'discourse/lib/ajax';
import RestModel from 'discourse/models/rest';
import ResultSet from 'discourse/models/result-set';
+import { getRegister } from 'discourse-common/lib/get-owner';
let _identityMap;
@@ -41,6 +42,11 @@ export default Ember.Object.extend({
_plurals: {'post-reply': 'post-replies',
'post-reply-history': 'post_reply_histories'},
+ init() {
+ this._super();
+ this.register = this.register || getRegister(this);
+ },
+
pluralize(thing) {
return this._plurals[thing] || thing + "s";
},
@@ -49,9 +55,9 @@ export default Ember.Object.extend({
this._plurals[thing] = plural;
},
- findAll(type) {
+ findAll(type, findArgs) {
const self = this;
- return this.adapterFor(type).findAll(this, type).then(function(result) {
+ return this.adapterFor(type).findAll(this, type, findArgs).then(function(result) {
return self._resultSet(type, result);
});
},
@@ -196,11 +202,11 @@ export default Ember.Object.extend({
obj.__state = obj.id ? "created" : "new";
// TODO: Have injections be automatic
- obj.topicTrackingState = this.container.lookup('topic-tracking-state:main');
- obj.keyValueStore = this.container.lookup('key-value-store:main');
- obj.siteSettings = this.container.lookup('site-settings:main');
+ obj.topicTrackingState = this.register.lookup('topic-tracking-state:main');
+ obj.keyValueStore = this.register.lookup('key-value-store:main');
+ obj.siteSettings = this.register.lookup('site-settings:main');
- const klass = this.container.lookupFactory('model:' + type) || RestModel;
+ const klass = this.register.lookupFactory('model:' + type) || RestModel;
const model = klass.create(obj);
storeMap(type, obj.id, model);
@@ -208,7 +214,7 @@ export default Ember.Object.extend({
},
adapterFor(type) {
- return this.container.lookup('adapter:' + type) || this.container.lookup('adapter:rest');
+ return this.register.lookup('adapter:' + type) || this.register.lookup('adapter:rest');
},
_lookupSubType(subType, type, id, root) {
@@ -287,7 +293,7 @@ export default Ember.Object.extend({
if (existing) {
delete obj.id;
- const klass = this.container.lookupFactory('model:' + type) || RestModel;
+ const klass = this.register.lookupFactory('model:' + type) || RestModel;
existing.setProperties(klass.munge(obj));
obj.id = id;
return existing;
diff --git a/app/assets/javascripts/discourse/models/tag-group.js.es6 b/app/assets/javascripts/discourse/models/tag-group.js.es6
index f27adad26b4..cfbd83e1640 100644
--- a/app/assets/javascripts/discourse/models/tag-group.js.es6
+++ b/app/assets/javascripts/discourse/models/tag-group.js.es6
@@ -9,9 +9,10 @@ const TagGroup = RestModel.extend({
},
save() {
- var url = "/tag_groups",
- self = this;
- if (this.get('id')) {
+ let url = "/tag_groups";
+ const self = this,
+ isNew = this.get('id') === 'new';
+ if (!isNew) {
url = "/tag_groups/" + this.get('id');
}
@@ -25,9 +26,11 @@ const TagGroup = RestModel.extend({
parent_tag_name: this.get('parent_tag_name') ? this.get('parent_tag_name') : undefined,
one_per_topic: this.get('one_per_topic')
},
- type: this.get('id') ? 'PUT' : 'POST'
+ type: isNew ? 'POST' : 'PUT'
}).then(function(result) {
- if(result.id) { self.set('id', result.id); }
+ if(result.tag_group && result.tag_group.id) {
+ self.set('id', result.tag_group.id);
+ }
self.set('savingStatus', I18n.t('saved'));
self.set('saving', false);
});
diff --git a/app/assets/javascripts/discourse/models/topic-details.js.es6 b/app/assets/javascripts/discourse/models/topic-details.js.es6
index 25714b0c4b4..72ef0d0fe9d 100644
--- a/app/assets/javascripts/discourse/models/topic-details.js.es6
+++ b/app/assets/javascripts/discourse/models/topic-details.js.es6
@@ -72,7 +72,7 @@ const TopicDetails = RestModel.extend({
type: 'PUT',
data: { name: name }
}).then(() => {
- groups.removeObject(groups.findProperty('name', name));
+ groups.removeObject(groups.findBy('name', name));
});
},
@@ -84,7 +84,7 @@ const TopicDetails = RestModel.extend({
type: 'PUT',
data: { username: username }
}).then(() => {
- users.removeObject(users.findProperty('username', username));
+ users.removeObject(users.findBy('username', username));
});
}
});
diff --git a/app/assets/javascripts/discourse/models/topic-list.js.es6 b/app/assets/javascripts/discourse/models/topic-list.js.es6
index 4e547619d13..6c90b31ab3c 100644
--- a/app/assets/javascripts/discourse/models/topic-list.js.es6
+++ b/app/assets/javascripts/discourse/models/topic-list.js.es6
@@ -2,27 +2,6 @@ import { ajax } from 'discourse/lib/ajax';
import RestModel from 'discourse/models/rest';
import Model from 'discourse/models/model';
-function topicsFrom(result, store) {
- if (!result) { return; }
-
- // Stitch together our side loaded data
- const categories = Discourse.Category.list(),
- users = Model.extractByKey(result.users, Discourse.User);
-
- return result.topic_list.topics.map(function (t) {
- t.category = categories.findBy('id', t.category_id);
- t.posters.forEach(function(p) {
- p.user = users[p.user_id];
- });
- if (t.participants) {
- t.participants.forEach(function(p) {
- p.user = users[p.user_id];
- });
- }
- return store.createRecord('topic', t);
- });
-}
-
const TopicList = RestModel.extend({
canLoadMore: Em.computed.notEmpty("more_topics_url"),
@@ -66,8 +45,8 @@ const TopicList = RestModel.extend({
if (result) {
// the new topics loaded from the server
- const newTopics = topicsFrom(result, store),
- topics = self.get("topics");
+ const newTopics = TopicList.topicsFrom(store, result);
+ const topics = self.get("topics");
self.forEachNew(newTopics, function(t) {
t.set('highlight', topicsAdded++ === 0);
@@ -103,7 +82,7 @@ const TopicList = RestModel.extend({
return ajax({ url }).then(result => {
let i = 0;
- topicList.forEachNew(topicsFrom(result, store), function(t) {
+ topicList.forEachNew(TopicList.topicsFrom(store, result), function(t) {
// highlight the first of the new topics so we can get a visual feedback
t.set('highlight', true);
topics.insertAt(i,t);
@@ -115,6 +94,26 @@ const TopicList = RestModel.extend({
});
TopicList.reopenClass({
+ topicsFrom(store, result) {
+ if (!result) { return; }
+
+ // Stitch together our side loaded data
+ const categories = Discourse.Category.list(),
+ users = Model.extractByKey(result.users, Discourse.User);
+
+ return result.topic_list.topics.map(function (t) {
+ t.category = categories.findBy('id', t.category_id);
+ t.posters.forEach(function(p) {
+ p.user = users[p.user_id];
+ });
+ if (t.participants) {
+ t.participants.forEach(function(p) {
+ p.user = users[p.user_id];
+ });
+ }
+ return store.createRecord('topic', t);
+ });
+ },
munge(json, store) {
json.inserted = json.inserted || [];
@@ -126,7 +125,7 @@ TopicList.reopenClass({
json.for_period = json.topic_list.for_period;
json.loaded = true;
json.per_page = json.topic_list.per_page;
- json.topics = topicsFrom(json, store);
+ json.topics = this.topicsFrom(store, json);
return json;
},
diff --git a/app/assets/javascripts/discourse/models/topic.js.es6 b/app/assets/javascripts/discourse/models/topic.js.es6
index 712a1b3690a..139b2ddcf7a 100644
--- a/app/assets/javascripts/discourse/models/topic.js.es6
+++ b/app/assets/javascripts/discourse/models/topic.js.es6
@@ -39,7 +39,7 @@ const Topic = RestModel.extend({
@computed('posters.[]')
lastPoster(posters) {
- var user;
+ let user;
if (posters && posters.length > 0) {
const latest = posters.filter(p => p.extras && p.extras.indexOf("latest") >= 0)[0];
user = latest && latest.user;
@@ -50,8 +50,8 @@ const Topic = RestModel.extend({
@computed('fancy_title')
fancyTitle(title) {
// TODO: `siteSettings` should always be present, but there are places in the code
- // that call Discourse.Topic.create instead of using the store. When the store is
- // used, remove this.
+ // that call Discourse.Topic.create instead of using the store.
+ // When the store is used, remove this.
const siteSettings = this.siteSettings || Discourse.SiteSettings;
return censor(emojiUnescape(title || ""), siteSettings.censored_words);
},
@@ -120,7 +120,7 @@ const Topic = RestModel.extend({
const categoryName = this.get('categoryName');
let category;
if (categoryName) {
- category = Discourse.Category.list().findProperty('name', categoryName);
+ category = Discourse.Category.list().findBy('name', categoryName);
}
this.set('category', category);
}.observes('categoryName'),
@@ -134,6 +134,11 @@ const Topic = RestModel.extend({
return this.get('url') + (user ? '?u=' + user.get('username_lower') : '');
}.property('url'),
+ @computed('url')
+ printUrl(url) {
+ return url + '/print';
+ },
+
url: function() {
let slug = this.get('slug') || '';
if (slug.trim().length === 0) {
@@ -208,7 +213,7 @@ const Topic = RestModel.extend({
}.property('views'),
archetypeObject: function() {
- return Discourse.Site.currentProp('archetypes').findProperty('id', this.get('archetype'));
+ return Discourse.Site.currentProp('archetypes').findBy('id', this.get('archetype'));
}.property('archetype'),
isPrivateMessage: Em.computed.equal('archetype', 'private_message'),
@@ -551,7 +556,6 @@ Topic.reopenClass({
opts.userFilters.forEach(function(username) {
data.username_filters.push(username);
});
- data.show_deleted = true;
}
// Add the summary of filter if we have it
diff --git a/app/assets/javascripts/discourse/models/user-action.js.es6 b/app/assets/javascripts/discourse/models/user-action.js.es6
index 024089799ae..ebc4be7381b 100644
--- a/app/assets/javascripts/discourse/models/user-action.js.es6
+++ b/app/assets/javascripts/discourse/models/user-action.js.es6
@@ -76,9 +76,9 @@ const UserAction = RestModel.extend({
return targetUsername === Discourse.User.currentProp('username');
},
- presentName: Em.computed.any('name', 'username'),
- targetDisplayName: Em.computed.any('target_name', 'target_username'),
- actingDisplayName: Em.computed.any('acting_name', 'acting_username'),
+ presentName: Ember.computed.or('name', 'username'),
+ targetDisplayName: Ember.computed.or('target_name', 'target_username'),
+ actingDisplayName: Ember.computed.or('acting_name', 'acting_username'),
targetUserUrl: url('target_username', '/users/%@'),
@computed("username")
diff --git a/app/assets/javascripts/discourse/models/user-stream.js.es6 b/app/assets/javascripts/discourse/models/user-stream.js.es6
index 49c02b4e61e..fc80dc94ef7 100644
--- a/app/assets/javascripts/discourse/models/user-stream.js.es6
+++ b/app/assets/javascripts/discourse/models/user-stream.js.es6
@@ -28,11 +28,21 @@ export default RestModel.extend({
baseUrl: url('itemsLoaded', 'user.username_lower', '/user_actions.json?offset=%@&username=%@'),
- filterBy(filter) {
- this.setProperties({ filter, itemsLoaded: 0, content: [], lastLoadedUrl: null });
+ filterBy(filter, noContentHelpKey) {
+ this.setProperties({
+ filter,
+ itemsLoaded: 0,
+ content: [],
+ noContentHelpKey: noContentHelpKey,
+ lastLoadedUrl: null
+ });
return this.findItems();
},
+ noContent: function() {
+ return this.get('loaded') && this.get('content').length === 0;
+ }.property('loaded', 'content.@each'),
+
remove(userAction) {
// 1) remove the user action from the child groups
this.get("content").forEach(function (ua) {
@@ -61,6 +71,9 @@ export default RestModel.extend({
if (this.get('filterParam')) {
findUrl += "&filter=" + this.get('filterParam');
}
+ if (this.get('noContentHelpKey')) {
+ findUrl += "&no_results_help_key=" + this.get('noContentHelpKey');
+ }
// Don't load the same stream twice. We're probably at the end.
const lastLoadedUrl = this.get('lastLoadedUrl');
@@ -69,6 +82,9 @@ export default RestModel.extend({
if (this.get('loading')) { return Ember.RSVP.resolve(); }
this.set('loading', true);
return ajax(findUrl, {cache: 'false'}).then( function(result) {
+ if (result && result.no_results_help) {
+ self.set('noContentHelp', result.no_results_help);
+ }
if (result && result.user_actions) {
const copy = Em.A();
result.user_actions.forEach(function(action) {
@@ -78,11 +94,11 @@ export default RestModel.extend({
self.get('content').pushObjects(UserAction.collapseStream(copy));
self.setProperties({
- loaded: true,
itemsLoaded: self.get('itemsLoaded') + result.user_actions.length
});
}
}).finally(function() {
+ self.set('loaded', true);
self.set('loading', false);
self.set('lastLoadedUrl', findUrl);
});
diff --git a/app/assets/javascripts/discourse/models/user.js.es6 b/app/assets/javascripts/discourse/models/user.js.es6
index 932454aa07c..d4e24f5af83 100644
--- a/app/assets/javascripts/discourse/models/user.js.es6
+++ b/app/assets/javascripts/discourse/models/user.js.es6
@@ -14,6 +14,7 @@ import Group from 'discourse/models/group';
import Topic from 'discourse/models/topic';
import { emojiUnescape } from 'discourse/lib/text';
import PreloadStore from 'preload-store';
+import { defaultHomepage } from 'discourse/lib/utilities';
const User = RestModel.extend({
@@ -63,7 +64,7 @@ const User = RestModel.extend({
@computed('profile_background')
profileBackground(bgUrl) {
- if (Em.isEmpty(bgUrl) || !Discourse.SiteSettings.allow_profile_backgrounds) { return; }
+ if (Em.isEmpty(bgUrl) || !Discourse.SiteSettings.allow_profile_backgrounds) { return "".htmlSafe(); }
return ('background-image: url(' + Discourse.getURLWithCDN(bgUrl) + ')').htmlSafe();
},
@@ -73,6 +74,46 @@ const User = RestModel.extend({
return Discourse.getURL(`/users/${this.get('username_lower')}`);
},
+ @computed()
+ userApiKeys() {
+ const keys = this.get('user_api_keys');
+ if (keys) {
+ return keys.map((raw)=>{
+ let obj = Em.Object.create(
+ raw
+ );
+
+ obj.revoke = () => {
+ this.revokeApiKey(obj);
+ };
+
+ obj.undoRevoke = () => {
+ this.undoRevokeApiKey(obj);
+ };
+
+ return obj;
+ });
+ }
+ },
+
+ revokeApiKey(key) {
+ return ajax("/user-api-key/revoke", {
+ type: 'POST',
+ data: { id: key.get('id') }
+ }).then(()=>{
+ key.set('revoked', true);
+ });
+ },
+
+ undoRevokeApiKey(key){
+ return ajax("/user-api-key/undo-revoke", {
+ type: 'POST',
+ data: { id: key.get('id') }
+ }).then(()=>{
+ key.set('revoked', false);
+ });
+ },
+
pmPath(topic) {
const userId = this.get('id');
const username = this.get('username_lower');
@@ -95,9 +136,15 @@ const User = RestModel.extend({
adminPath: url('id', 'username_lower', "/admin/users/%@1/%@2"),
- mutedTopicsPath: url('/latest?state=muted'),
+ @computed()
+ mutedTopicsPath() {
+ return defaultHomepage() === "latest" ? Discourse.getURL('/?state=muted') : Discourse.getURL('/latest?state=muted');
+ },
- watchingTopicsPath: url('/latest?state=watching'),
+ @computed()
+ watchingTopicsPath() {
+ return defaultHomepage() === "latest" ? Discourse.getURL('/?state=watching') : Discourse.getURL('/latest?state=watching');
+ },
@computed("username")
username_lower(username) {
@@ -106,7 +153,7 @@ const User = RestModel.extend({
@computed("trust_level")
trustLevel(trustLevel) {
- return Discourse.Site.currentProp('trustLevels').findProperty('id', parseInt(trustLevel, 10));
+ return Discourse.Site.currentProp('trustLevels').findBy('id', parseInt(trustLevel, 10));
},
isBasic: Em.computed.equal('trust_level', 0),
@@ -116,6 +163,11 @@ const User = RestModel.extend({
isSuspended: Em.computed.equal('suspended', true),
+ @computed("previous_visit_at")
+ previousVisitAt(previous_visit_at) {
+ return new Date(previous_visit_at);
+ },
+
@computed("suspended_till")
suspended(suspendedTill) {
return suspendedTill && moment(suspendedTill).isAfter();
@@ -159,7 +211,8 @@ const User = RestModel.extend({
'muted_tags',
'tracked_tags',
'watched_tags',
- 'watching_first_post_tags');
+ 'watching_first_post_tags',
+ 'date_of_birth');
['email_always',
'mailing_list_mode',
@@ -177,6 +230,7 @@ const User = RestModel.extend({
'digest_after_minutes',
'new_topic_duration_minutes',
'auto_track_topics_after_msecs',
+ 'notification_level_when_replying',
'like_notification_frequency',
'include_tl0_in_digests'
].forEach(s => {
@@ -200,7 +254,7 @@ const User = RestModel.extend({
// TODO: We can remove this when migrated fully to rest model.
this.set('isSaving', true);
- return ajax(`/users/${this.get('username_lower')}`, {
+ return ajax(`/users/${this.get('username_lower')}.json`, {
data: data,
type: 'PUT'
}).then(result => {
@@ -269,7 +323,7 @@ const User = RestModel.extend({
@computed("stats.@each.isPM")
statsExcludingPms() {
if (Ember.isEmpty(this.get('stats'))) return [];
- return this.get('stats').rejectProperty('isPM');
+ return this.get('stats').rejectBy('isPM');
},
findDetails(options) {
@@ -287,7 +341,15 @@ const User = RestModel.extend({
}
if (!Em.isEmpty(json.user.groups)) {
- json.user.groups = json.user.groups.map(g => Group.create(g));
+ const groups = [];
+
+ for(let i = 0; i < json.user.groups.length; i++) {
+ const group = Group.create(json.user.groups[i]);
+ group.group_user = json.user.group_users[i];
+ groups.push(group);
+ }
+
+ json.user.groups = groups;
}
if (json.user.invited_by) {
@@ -472,12 +534,12 @@ User.reopenClass(Singleton, {
action_type: UserAction.TYPES.replies
});
- stats.filterProperty('isResponse').forEach(stat => {
+ stats.filterBy('isResponse').forEach(stat => {
responses.set('count', responses.get('count') + stat.get('count'));
});
const result = Em.A();
- result.pushObjects(stats.rejectProperty('isResponse'));
+ result.pushObjects(stats.rejectBy('isResponse'));
let insertAt = 0;
result.forEach((item, index) => {
diff --git a/app/assets/javascripts/discourse/pre-initializers/inject-discourse-objects.js.es6 b/app/assets/javascripts/discourse/pre-initializers/inject-discourse-objects.js.es6
index 04729de959f..51849ef4025 100644
--- a/app/assets/javascripts/discourse/pre-initializers/inject-discourse-objects.js.es6
+++ b/app/assets/javascripts/discourse/pre-initializers/inject-discourse-objects.js.es6
@@ -7,7 +7,6 @@ import DiscourseLocation from 'discourse/lib/discourse-location';
import SearchService from 'discourse/services/search';
import { startTracking, default as TopicTrackingState } from 'discourse/models/topic-tracking-state';
import ScreenTrack from 'discourse/lib/screen-track';
-import TopicFooterButtons from 'discourse/components/topic-footer-buttons';
function inject() {
const app = arguments[0],
@@ -18,7 +17,7 @@ function inject() {
}
function injectAll(app, name) {
- inject(app, name, 'controller', 'component', 'route', 'view', 'model', 'adapter');
+ inject(app, name, 'controller', 'component', 'route', 'model', 'adapter');
}
export default {
@@ -63,7 +62,9 @@ export default {
app.register('screen-track:main', screenTrack, { instantiate: false });
inject(app, 'screenTrack', 'component', 'route');
- inject(app, 'currentUser', 'component', 'route', 'controller');
+ if (currentUser) {
+ inject(app, 'currentUser', 'component', 'route', 'controller');
+ }
app.register('location:discourse-location', DiscourseLocation);
@@ -71,13 +72,6 @@ export default {
app.register('key-value-store:main', keyValueStore, { instantiate: false });
injectAll(app, 'keyValueStore');
- Discourse.TopicFooterButtonsView = {
- reopen(obj) {
- Ember.warn('`Discourse.TopicFooterButtonsView` is deprecated. Use the `topic-footer-buttons` component instead');
- TopicFooterButtons.reopen(obj);
- }
- };
-
startTracking(topicTrackingState);
}
};
diff --git a/app/assets/javascripts/discourse/pre-initializers/map-routes.js.es6 b/app/assets/javascripts/discourse/pre-initializers/map-routes.js.es6
index e3492014424..e0736bca581 100644
--- a/app/assets/javascripts/discourse/pre-initializers/map-routes.js.es6
+++ b/app/assets/javascripts/discourse/pre-initializers/map-routes.js.es6
@@ -1,4 +1,4 @@
-import { mapRoutes } from 'discourse/router';
+import { mapRoutes } from 'discourse/mapping-router';
export default {
name: "map-routes",
@@ -10,7 +10,7 @@ export default {
// HACK to fix: https://github.com/emberjs/ember.js/issues/10310
const originalBuildInstance = originalBuildInstance || Ember.Application.prototype.buildInstance;
Ember.Application.prototype.buildInstance = function() {
- this.registry = this.buildRegistry();
+ this.buildRegistry();
return originalBuildInstance.apply(this);
};
}
diff --git a/app/assets/javascripts/discourse/pre-initializers/sniff-capabilities.js.es6 b/app/assets/javascripts/discourse/pre-initializers/sniff-capabilities.js.es6
index 9a409fcc827..50bd993956b 100644
--- a/app/assets/javascripts/discourse/pre-initializers/sniff-capabilities.js.es6
+++ b/app/assets/javascripts/discourse/pre-initializers/sniff-capabilities.js.es6
@@ -1,4 +1,4 @@
-/*global Modernizr:true*/
+/*global Modernizr:true safari:true*/
// Initializes an object that lets us know about our capabilities.
export default {
@@ -20,7 +20,7 @@ export default {
caps.isOpera = !!window.opera || ua.indexOf(' OPR/') >= 0;
caps.isFirefox = typeof InstallTrigger !== 'undefined';
- caps.isSafari = Object.prototype.toString.call(window.HTMLElement).indexOf('Constructor') > 0;
+ caps.isSafari = Object.prototype.toString.call(window.HTMLElement).indexOf('Constructor') > 0 || (function (p) { return p.toString() === "[object SafariRemoteNotification]"; })(!window['safari'] || safari.pushNotification);
caps.isChrome = !!window.chrome && !caps.isOpera;
caps.canPasteImages = caps.isChrome || caps.isFirefox;
}
diff --git a/app/assets/javascripts/discourse/views/list/post-count-or-badges.js.es6 b/app/assets/javascripts/discourse/raw-views/list/post-count-or-badges.js.es6
similarity index 100%
rename from app/assets/javascripts/discourse/views/list/post-count-or-badges.js.es6
rename to app/assets/javascripts/discourse/raw-views/list/post-count-or-badges.js.es6
diff --git a/app/assets/javascripts/discourse/raw-views/list/posts-count-column.js.es6 b/app/assets/javascripts/discourse/raw-views/list/posts-count-column.js.es6
new file mode 100644
index 00000000000..e61e1b9c081
--- /dev/null
+++ b/app/assets/javascripts/discourse/raw-views/list/posts-count-column.js.es6
@@ -0,0 +1,33 @@
+import computed from 'ember-addons/ember-computed-decorators';
+import { fmt } from 'discourse/lib/computed';
+
+export default Ember.Object.extend({
+ tagName: "td",
+
+ @computed("topic.like_count", "topic.posts_count")
+ ratio(likeCount, postCount) {
+ const likes = parseFloat(likeCount);
+ const posts = parseFloat(postCount);
+
+ if (posts < 10) { return 0; }
+
+ return (likes || 0) / posts;
+ },
+
+ @computed("topic.replyCount", "ratioText")
+ title(count, ratio) {
+ return I18n.messageFormat('posts_likes_MF', { count, ratio }).trim();
+ },
+
+ @computed("ratio")
+ ratioText(ratio) {
+ const settings = this.siteSettings;
+ if (ratio > settings.topic_post_like_heat_high) { return 'high'; }
+ if (ratio > settings.topic_post_like_heat_medium) { return 'med'; }
+ if (ratio > settings.topic_post_like_heat_low) { return 'low'; }
+ return '';
+ },
+
+ likesHeat: fmt('ratioText', 'heatmap-%@'),
+});
+
diff --git a/app/assets/javascripts/discourse/raw-views/list/visited-line.js.es6 b/app/assets/javascripts/discourse/raw-views/list/visited-line.js.es6
new file mode 100644
index 00000000000..0f07c3bb59a
--- /dev/null
+++ b/app/assets/javascripts/discourse/raw-views/list/visited-line.js.es6
@@ -0,0 +1,5 @@
+export default Ember.Object.extend({
+ isLastVisited: function(){
+ return (this.get('lastVisitedTopic') === this.get('topic'));
+ }.property()
+});
diff --git a/app/assets/javascripts/discourse/views/topic-list-header-column.js.es6 b/app/assets/javascripts/discourse/raw-views/topic-list-header-column.js.es6
similarity index 99%
rename from app/assets/javascripts/discourse/views/topic-list-header-column.js.es6
rename to app/assets/javascripts/discourse/raw-views/topic-list-header-column.js.es6
index 72316011582..781fdc131b3 100644
--- a/app/assets/javascripts/discourse/views/topic-list-header-column.js.es6
+++ b/app/assets/javascripts/discourse/raw-views/topic-list-header-column.js.es6
@@ -1,5 +1,4 @@
export default Ember.Object.extend({
-
localizedName: function(){
if(this.forceName){
return this.forceName;
diff --git a/app/assets/javascripts/discourse/views/topic-status.js.es6 b/app/assets/javascripts/discourse/raw-views/topic-status.js.es6
similarity index 100%
rename from app/assets/javascripts/discourse/views/topic-status.js.es6
rename to app/assets/javascripts/discourse/raw-views/topic-status.js.es6
diff --git a/app/assets/javascripts/discourse/router.js.es6 b/app/assets/javascripts/discourse/router.js.es6
deleted file mode 100644
index 0223dfe41be..00000000000
--- a/app/assets/javascripts/discourse/router.js.es6
+++ /dev/null
@@ -1,83 +0,0 @@
-const rootURL = Discourse.BaseUri;
-
-const BareRouter = Ember.Router.extend({
- rootURL,
- location: Ember.testing ? 'none': 'discourse-location'
-});
-
-export function mapRoutes() {
-
- var Router = BareRouter.extend();
- const resources = {};
- const paths = {};
-
- // If a module is defined as `route-map` in discourse or a plugin, its routes
- // will be built automatically. You can supply a `resource` property to
- // automatically put it in that resource, such as `admin`. That way plugins
- // can define admin routes.
- Object.keys(requirejs._eak_seen).forEach(function(key) {
- if (/route-map$/.test(key)) {
- var module = require(key, null, null, true);
- if (!module || !module.default) { throw new Error(key + ' must export a route map.'); }
-
- var mapObj = module.default;
- if (typeof mapObj === 'function') {
- mapObj = { resource: 'root', map: mapObj };
- }
-
- if (!resources[mapObj.resource]) { resources[mapObj.resource] = []; }
- resources[mapObj.resource].push(mapObj.map);
- if (mapObj.path) { paths[mapObj.resource] = mapObj.path; }
- }
- });
-
- return Router.map(function() {
- var router = this;
-
- // Do the root resources first
- if (resources.root) {
- resources.root.forEach(function(m) {
- m.call(router);
- });
- delete resources.root;
- }
-
- // Even if no plugins set it up, we need an `adminPlugins` route
- var adminPlugins = 'admin.adminPlugins';
- resources[adminPlugins] = resources[adminPlugins] || [Ember.K];
- paths[adminPlugins] = paths[adminPlugins] || "/plugins";
-
- var segments = {},
- standalone = [];
-
- Object.keys(resources).forEach(function(r) {
- var m = /^([^\.]+)\.(.*)$/.exec(r);
- if (m) {
- segments[m[1]] = m[2];
- } else {
- standalone.push(r);
- }
- });
-
- // Apply other resources next. A little hacky but works!
- standalone.forEach(function(r) {
- router.resource(r, {path: paths[r]}, function() {
- var res = this;
- resources[r].forEach(function(m) { m.call(res); });
-
- var s = segments[r];
- if (s) {
- var full = r + '.' + s;
- res.resource(s, {path: paths[full]}, function() {
- var nestedRes = this;
- resources[full].forEach(function(m) { m.call(nestedRes); });
- });
- }
- });
- });
-
- this.route('unknown', {path: '*path'});
- });
-}
-
-export default BareRouter;
diff --git a/app/assets/javascripts/discourse/routes/app-route-map.js.es6 b/app/assets/javascripts/discourse/routes/app-route-map.js.es6
index 2f26a0248e3..7dc4502cf75 100644
--- a/app/assets/javascripts/discourse/routes/app-route-map.js.es6
+++ b/app/assets/javascripts/discourse/routes/app-route-map.js.es6
@@ -1,20 +1,18 @@
-import { defaultHomepage } from 'discourse/lib/utilities';
-
export default function() {
// Error page
this.route('exception', { path: '/exception' });
- this.resource('about', { path: '/about' });
+ this.route('about', { path: '/about', resetNamespace: true });
// Topic routes
- this.resource('topic', { path: '/t/:slug/:id' }, function() {
+ this.route('topic', { path: '/t/:slug/:id', resetNamespace: true }, function() {
this.route('fromParams', { path: '/' });
this.route('fromParamsNear', { path: '/:nearPost' });
});
- this.resource('topicBySlug', { path: '/t/:slug' });
+ this.route('topicBySlug', { path: '/t/:slug', resetNamespace: true });
this.route('topicUnsubscribe', { path: '/t/:slug/:id/unsubscribe' });
- this.resource('discovery', { path: '/' }, function() {
+ this.route('discovery', { path: '/', resetNamespace: true }, function() {
// top
this.route('top');
this.route('topParentCategory', { path: '/c/:slug/l/top' });
@@ -45,24 +43,29 @@ export default function() {
this.route('categoryNone', { path: '/c/:slug/none' });
this.route('category', { path: '/c/:parentSlug/:slug' });
this.route('categoryWithID', { path: '/c/:parentSlug/:slug/:id' });
-
- // homepage
- this.route(defaultHomepage(), { path: '/' });
});
- this.resource('group', { path: '/groups/:name' }, function() {
+ this.route('groups', { resetNamespace: true });
+
+ this.route('group', { path: '/groups/:name', resetNamespace: true }, function() {
this.route('members');
- this.route('posts');
- this.route('topics');
- this.route('mentions');
- this.route('messages');
+
+ this.route('activity', function() {
+ this.route('posts');
+ this.route('topics');
+ this.route('mentions');
+ this.route('messages');
+ });
+
+ this.route('logs');
+ this.route('edit');
});
// User routes
- this.resource('users');
- this.resource('user', { path: '/users/:username' }, function() {
+ this.route('users', { resetNamespace: true });
+ this.route('user', { path: '/users/:username', resetNamespace: true }, function() {
this.route('summary');
- this.resource('userActivity', { path: '/activity' }, function() {
+ this.route('userActivity', { path: '/activity', resetNamespace: true }, function() {
this.route('topics');
this.route('replies');
this.route('likesGiven', {path: 'likes-given'});
@@ -70,7 +73,7 @@ export default function() {
this.route('pending');
});
- this.resource('userNotifications', {path: '/notifications'}, function(){
+ this.route('userNotifications', {path: '/notifications', resetNamespace: true}, function(){
this.route('responses');
this.route('likesReceived', { path: 'likes-received'});
this.route('mentions');
@@ -81,14 +84,14 @@ export default function() {
this.route('flaggedPosts', { path: '/flagged-posts' });
this.route('deletedPosts', { path: '/deleted-posts' });
- this.resource('userPrivateMessages', { path: '/messages' }, function() {
+ this.route('userPrivateMessages', { path: '/messages', resetNamespace: true }, function() {
this.route('sent');
this.route('archive');
this.route('group', { path: 'group/:name'});
this.route('groupArchive', { path: 'group/:name/archive'});
});
- this.resource('preferences', function() {
+ this.route('preferences', { resetNamespace: true }, function() {
this.route('username');
this.route('email');
this.route('about', { path: '/about-me' });
@@ -96,7 +99,7 @@ export default function() {
this.route('card-badge', { path: '/card-badge' });
});
- this.resource('userInvited', { path: '/invited' }, function() {
+ this.route('userInvited', { path: '/invited', resetNamespace: true }, function() {
this.route('show', { path: '/:filter' });
});
@@ -114,15 +117,15 @@ export default function() {
this.route('new-topic', {path: '/new-topic'});
this.route('new-message', {path: '/new-message'});
- this.resource('badges', function() {
+ this.route('badges', { resetNamespace: true }, function() {
this.route('show', {path: '/:id/:slug'});
});
- this.resource('queued-posts', { path: '/queued-posts' });
+ this.route('queued-posts', { path: '/queued-posts', resetNamespace: true });
this.route('full-page-search', {path: '/search'});
- this.resource('tags', function() {
+ this.route('tags', { resetNamespace: true }, function() {
this.route('show', {path: '/:tag_id'});
this.route('showCategory', {path: '/c/:category/:tag_id'});
this.route('showParentCategory', {path: '/c/:parent_category/:category/:tag_id'});
@@ -132,9 +135,10 @@ export default function() {
this.route('showCategory' + filter.capitalize(), {path: '/c/:category/:tag_id/l/' + filter});
this.route('showParentCategory' + filter.capitalize(), {path: '/c/:parent_category/:category/:tag_id/l/' + filter});
});
+ this.route('intersection', {path: 'intersection/:tag_id/*additional_tags'});
});
- this.resource('tagGroups', {path: '/tag_groups'}, function() {
+ this.route('tagGroups', {path: '/tag_groups', resetNamespace: true}, function() {
this.route('show', {path: '/:id'});
});
}
diff --git a/app/assets/javascripts/discourse/routes/application.js.es6 b/app/assets/javascripts/discourse/routes/application.js.es6
index 2b216ce15b7..1c3fed9a6bf 100644
--- a/app/assets/javascripts/discourse/routes/application.js.es6
+++ b/app/assets/javascripts/discourse/routes/application.js.es6
@@ -6,6 +6,7 @@ import OpenComposer from "discourse/mixins/open-composer";
import Category from 'discourse/models/category';
import mobile from 'discourse/lib/mobile';
import { findAll } from 'discourse/models/login-method';
+import { getOwner } from 'discourse-common/lib/get-owner';
function unlessReadOnly(method, message) {
return function() {
@@ -20,20 +21,7 @@ function unlessReadOnly(method, message) {
const ApplicationRoute = Discourse.Route.extend(OpenComposer, {
siteTitle: setting('title'),
- _handleLogout() {
- if (this.currentUser) {
- this.currentUser.destroySession().then(() => logout(this.siteSettings, this.keyValueStore));
- }
- },
-
actions: {
-
- showSearchHelp() {
- ajax("/static/search_help.html", { dataType: 'html' }).then(model => {
- showModal('searchHelp', { model });
- });
- },
-
toggleAnonymous() {
ajax("/users/toggle-anon", {method: 'POST'}).then(() => {
window.location.reload();
@@ -53,15 +41,11 @@ const ApplicationRoute = Discourse.Route.extend(OpenComposer, {
// Ember doesn't provider a router `willTransition` event so let's make one
willTransition() {
- var router = this.container.lookup('router:main');
+ var router = getOwner(this).lookup('router:main');
Ember.run.once(router, router.trigger, 'willTransition');
return this._super();
},
- showTopicEntrance(data) {
- this.controllerFor('topic-entrance').send('show', data);
- },
-
postWasEnqueued(details) {
const title = details.reason ? 'queue_reason.' + details.reason + '.title' : 'queue.approval.title';
showModal('post-enqueued', {model: details, title });
@@ -143,12 +127,12 @@ const ApplicationRoute = Discourse.Route.extend(OpenComposer, {
},
editCategory(category) {
- Category.reloadById(category.get('id')).then((atts) => {
+ Category.reloadById(category.get('id')).then(atts => {
const model = this.store.createRecord('category', atts.category);
model.setupGroupsAndPermissions();
this.site.updateCategory(model);
- showModal('editCategory', { model });
- this.controllerFor('editCategory').set('selectedTab', 'general');
+ showModal('edit-category', { model });
+ this.controllerFor('edit-category').set('selectedTab', 'general');
});
},
@@ -162,10 +146,9 @@ const ApplicationRoute = Discourse.Route.extend(OpenComposer, {
},
changeBulkTemplate(w) {
- const controllerName = w.replace('modal/', ''),
- factory = this.container.lookupFactory('controller:' + controllerName);
-
- this.render(w, {into: 'modal/topic-bulk-actions', outlet: 'bulkOutlet', controller: factory ? controllerName : 'topic-bulk-actions'});
+ const controllerName = w.replace('modal/', '');
+ const controller = getOwner(this).lookup('controller:' + controllerName);
+ this.render(w, {into: 'modal/topic-bulk-actions', outlet: 'bulkOutlet', controller: controller ? controllerName : 'topic-bulk-actions'});
},
createNewTopicViaParams(title, body, category_id, category, tags) {
@@ -185,6 +168,13 @@ const ApplicationRoute = Discourse.Route.extend(OpenComposer, {
});
},
+ renderTemplate() {
+ this.render('application');
+ this.render('user-card', { into: 'application', outlet: 'user-card' });
+ this.render('modal', { into: 'application', outlet: 'modal' });
+ this.render('composer', { into: 'application', outlet: 'composer' });
+ },
+
handleShowLogin() {
if (this.siteSettings.enable_sso) {
const returnPath = encodeURIComponent(window.location.pathname);
@@ -204,7 +194,10 @@ const ApplicationRoute = Discourse.Route.extend(OpenComposer, {
},
_autoLogin(modal, modalClass, notAuto) {
- const methods = findAll(this.siteSettings);
+ const methods = findAll(this.siteSettings,
+ getOwner(this).lookup('capabilities:main'),
+ this.site.isMobileDevice);
+
if (!this.siteSettings.enable_local_logins && methods.length === 1) {
this.controllerFor('login').send('externalLogin', methods[0]);
} else {
@@ -214,6 +207,11 @@ const ApplicationRoute = Discourse.Route.extend(OpenComposer, {
}
},
+ _handleLogout() {
+ if (this.currentUser) {
+ this.currentUser.destroySession().then(() => logout(this.siteSettings, this.keyValueStore));
+ }
+ },
});
RSVP.EventTarget.mixin(ApplicationRoute);
diff --git a/app/assets/javascripts/discourse/routes/build-category-route.js.es6 b/app/assets/javascripts/discourse/routes/build-category-route.js.es6
index f9792401565..14bc77f8a5f 100644
--- a/app/assets/javascripts/discourse/routes/build-category-route.js.es6
+++ b/app/assets/javascripts/discourse/routes/build-category-route.js.es6
@@ -67,9 +67,6 @@ export default (filter, params) => {
return findTopicList(this.store, this.topicTrackingState, listFilter, findOpts, extras).then(list => {
TopicList.hideUniformCategory(list, category);
this.set('topics', list);
- if (list.topic_list.tags) {
- Discourse.Site.currentProp('top_tags', list.topic_list.tags);
- }
return list;
});
},
diff --git a/app/assets/javascripts/discourse/routes/build-topic-route.js.es6 b/app/assets/javascripts/discourse/routes/build-topic-route.js.es6
index 43c920535ee..d7a2116bee6 100644
--- a/app/assets/javascripts/discourse/routes/build-topic-route.js.es6
+++ b/app/assets/javascripts/discourse/routes/build-topic-route.js.es6
@@ -54,6 +54,9 @@ function findTopicList(store, tracking, filter, filterParams, extras) {
tracking.trackIncoming(list.filter);
}
Discourse.Session.currentProp('topicList', list);
+ if (list.topic_list && list.topic_list.tags) {
+ Discourse.Site.currentProp('top_tags', list.topic_list.tags);
+ }
return list;
});
}
diff --git a/app/assets/javascripts/discourse/routes/discourse.js.es6 b/app/assets/javascripts/discourse/routes/discourse.js.es6
index 8b4c7b8465d..8b3d3bbc310 100644
--- a/app/assets/javascripts/discourse/routes/discourse.js.es6
+++ b/app/assets/javascripts/discourse/routes/discourse.js.es6
@@ -74,33 +74,4 @@ const DiscourseRoute = Ember.Route.extend({
}
});
-export function cleanDOM() {
- if (window.MiniProfiler) {
- window.MiniProfiler.pageTransition();
- }
-
- // Close some elements that may be open
- $('header ul.icons li').removeClass('active');
- $('[data-toggle="dropdown"]').parent().removeClass('open');
- // close the lightbox
- if ($.magnificPopup && $.magnificPopup.instance) {
- $.magnificPopup.instance.close();
- $('body').removeClass('mfp-zoom-out-cur');
- }
-
- // Remove any link focus
- // NOTE: the '.not("body")' is here to prevent a bug in IE10 on Win7
- // cf. https://stackoverflow.com/questions/5657371
- $(document.activeElement).not("body").not(".no-blur").blur();
-
- Discourse.set('notifyCount',0);
- Discourse.__container__.lookup('route:application').send('closeModal');
- const hideDropDownFunction = $('html').data('hide-dropdown');
- if (hideDropDownFunction) { hideDropDownFunction(); }
-
- // TODO: Avoid container lookup here
- const appEvents = Discourse.__container__.lookup('app-events:main');
- appEvents.trigger('dom:clean');
-}
-
export default DiscourseRoute;
diff --git a/app/assets/javascripts/discourse/routes/discovery-categories.js.es6 b/app/assets/javascripts/discourse/routes/discovery-categories.js.es6
index 4aa3e17a5f6..9f4c76ee7d5 100644
--- a/app/assets/javascripts/discourse/routes/discovery-categories.js.es6
+++ b/app/assets/javascripts/discourse/routes/discovery-categories.js.es6
@@ -2,7 +2,9 @@ import showModal from "discourse/lib/show-modal";
import OpenComposer from "discourse/mixins/open-composer";
import CategoryList from "discourse/models/category-list";
import { defaultHomepage } from 'discourse/lib/utilities';
-import PreloadStore from 'preload-store';
+import TopicList from "discourse/models/topic-list";
+import { ajax } from "discourse/lib/ajax";
+import PreloadStore from "preload-store";
const DiscoveryCategoriesRoute = Discourse.Route.extend(OpenComposer, {
renderTemplate() {
@@ -15,20 +17,61 @@ const DiscoveryCategoriesRoute = Discourse.Route.extend(OpenComposer, {
},
model() {
- // TODO: Remove this and ensure server side does not supply `topic_list`
- // if default page is categories
- PreloadStore.remove("topic_list");
+ const style = !this.site.mobileView && this.siteSettings.desktop_category_page_style;
+ const parentCategory = this.get("model.parentCategory");
- return CategoryList.list(this.store, 'categories').then(list => {
+ let promise;
+ if (parentCategory) {
+ promise = CategoryList.listForParent(this.store, parentCategory);
+ } else if (style === "categories_and_latest_topics") {
+ promise = this._loadCategoriesAndLatestTopics();
+ } else {
+ promise = CategoryList.list(this.store);
+ }
+
+ return promise.then(model => {
const tracking = this.topicTrackingState;
if (tracking) {
- tracking.sync(list, "categories");
+ tracking.sync(model, "categories");
tracking.trackIncoming("categories");
}
- return list;
+ return model;
});
},
+ _loadCategoriesAndLatestTopics() {
+ const wrappedCategoriesList = PreloadStore.getAndRemove("categories_list");
+ const topicListLatest = PreloadStore.getAndRemove("topic_list_latest");
+ const categoriesList = wrappedCategoriesList && wrappedCategoriesList.category_list;
+ if (categoriesList && topicListLatest) {
+ return new Ember.RSVP.Promise(resolve => {
+ const result = Ember.Object.create({
+ categories: CategoryList.categoriesFrom(this.store, wrappedCategoriesList),
+ topics: TopicList.topicsFrom(this.store, topicListLatest),
+ can_create_category: categoriesList.can_create_category,
+ can_create_topic: categoriesList.can_create_topic,
+ draft_key: categoriesList.draft_key,
+ draft: categoriesList.draft,
+ draft_sequence: categoriesList.draft_sequence
+ });
+
+ resolve(result);
+ });
+ } else {
+ return ajax("/categories_and_latest").then(result => {
+ return Ember.Object.create({
+ categories: CategoryList.categoriesFrom(this.store, result),
+ topics: TopicList.topicsFrom(this.store, result),
+ can_create_category: result.category_list.can_create_category,
+ can_create_topic: result.category_list.can_create_topic,
+ draft_key: result.category_list.draft_key,
+ draft: result.category_list.draft,
+ draft_sequence: result.category_list.draft_sequence
+ });
+ });
+ }
+ },
+
titleToken() {
if (defaultHomepage() === "categories") { return; }
return I18n.t("filters.categories.title");
@@ -46,6 +89,24 @@ const DiscoveryCategoriesRoute = Discourse.Route.extend(OpenComposer, {
},
actions: {
+
+ refresh() {
+ const controller = this.controllerFor("discovery/categories");
+
+ // Don't refresh if we're still loading
+ if (!controller || controller.get("loading")) { return; }
+
+ // If we `send('loading')` here, due to returning true it bubbles up to the
+ // router and ember throws an error due to missing `handlerInfos`.
+ // Lesson learned: Don't call `loading` yourself.
+ controller.set("loading", true);
+
+ this.model().then(model => {
+ this.setupController(controller, model);
+ controller.send("loadingComplete");
+ });
+ },
+
createCategory() {
const groups = this.site.groups,
everyoneName = groups.findBy("id", 0).name;
@@ -53,11 +114,12 @@ const DiscoveryCategoriesRoute = Discourse.Route.extend(OpenComposer, {
const model = this.store.createRecord('category', {
color: "AB9364", text_color: "FFFFFF", group_permissions: [{group_name: everyoneName, permission_type: 1}],
available_groups: groups.map(g => g.name),
- allow_badges: true
+ allow_badges: true,
+ topic_featured_link_allowed: true
});
- showModal("editCategory", { model });
- this.controllerFor("editCategory").set("selectedTab", "general");
+ showModal("edit-category", { model });
+ this.controllerFor("edit-category").set("selectedTab", "general");
},
reorderCategories() {
diff --git a/app/assets/javascripts/discourse/routes/discovery.js.es6 b/app/assets/javascripts/discourse/routes/discovery.js.es6
index 400d1df1eea..a77806d1a4d 100644
--- a/app/assets/javascripts/discourse/routes/discovery.js.es6
+++ b/app/assets/javascripts/discourse/routes/discovery.js.es6
@@ -11,7 +11,7 @@ export default Discourse.Route.extend(OpenComposer, {
},
beforeModel(transition) {
- if (transition.intent.url === "/" &&
+ if ((transition.intent.url === "/" || transition.intent.url === "/categories") &&
transition.targetName.indexOf("discovery.top") === -1 &&
Discourse.User.currentProp("should_be_redirected_to_top")) {
Discourse.User.currentProp("should_be_redirected_to_top", false);
diff --git a/app/assets/javascripts/discourse/routes/forgot-password.js.es6 b/app/assets/javascripts/discourse/routes/forgot-password.js.es6
index df8ab36145b..648bf44ca30 100644
--- a/app/assets/javascripts/discourse/routes/forgot-password.js.es6
+++ b/app/assets/javascripts/discourse/routes/forgot-password.js.es6
@@ -1,10 +1,12 @@
+import { defaultHomepage } from 'discourse/lib/utilities';
import buildStaticRoute from 'discourse/routes/build-static-route';
const ForgotPasswordRoute = buildStaticRoute('password-reset');
ForgotPasswordRoute.reopen({
beforeModel() {
- this.replaceWith(this.controllerFor('application').get('loginRequired') ? 'login' : 'discovery').then(e => {
+ const loginRequired = this.controllerFor('application').get('loginRequired');
+ this.replaceWith(loginRequired ? 'login' : `discovery.${defaultHomepage()}`).then(e => {
Ember.run.next(() => e.send('showForgotPassword'));
});
},
diff --git a/app/assets/javascripts/discourse/routes/full-page-search.js.es6 b/app/assets/javascripts/discourse/routes/full-page-search.js.es6
index 8507c0dce4e..eb0cc01092c 100644
--- a/app/assets/javascripts/discourse/routes/full-page-search.js.es6
+++ b/app/assets/javascripts/discourse/routes/full-page-search.js.es6
@@ -2,13 +2,14 @@ import { ajax } from 'discourse/lib/ajax';
import { translateResults, getSearchKey, isValidSearchTerm } from "discourse/lib/search";
import Composer from 'discourse/models/composer';
import PreloadStore from 'preload-store';
+import { getTransient, setTransient } from 'discourse/lib/page-tracker';
+import { getOwner } from 'discourse-common/lib/get-owner';
export default Discourse.Route.extend({
- queryParams: { q: {}, context_id: {}, context: {}, skip_context: {} },
+ queryParams: { q: {}, expanded: false, context_id: {}, context: {}, skip_context: {} },
model(params) {
- const router = Discourse.__container__.lookup('router:main');
- var cached = router.transientCache('lastSearch');
+ const cached = getTransient('lastSearch');
var args = { q: params.q };
if (params.context_id && !args.skip_context) {
args.search_context = {
@@ -21,7 +22,7 @@ export default Discourse.Route.extend({
if (cached && cached.data.searchKey === searchKey) {
// extend expiry
- router.transientCache('lastSearch', { searchKey, model: cached.data.model }, 5);
+ setTransient('lastSearch', { searchKey, model: cached.data.model }, 5);
return cached.data.model;
}
@@ -33,7 +34,7 @@ export default Discourse.Route.extend({
}
}).then(results => {
const model = (results && translateResults(results)) || {};
- router.transientCache('lastSearch', { searchKey, model }, 5);
+ setTransient('lastSearch', { searchKey, model }, 5);
return model;
});
},
@@ -52,7 +53,7 @@ export default Discourse.Route.extend({
category = match[1];
}
}
- this.container.lookup('controller:composer').open({action: Composer.CREATE_TOPIC, draftKey: Composer.CREATE_TOPIC, topicCategory: category});
+ getOwner(this).lookup('controller:composer').open({action: Composer.CREATE_TOPIC, draftKey: Composer.CREATE_TOPIC, topicCategory: category});
}
}
diff --git a/app/assets/javascripts/discourse/routes/group-activity-mentions.js.es6 b/app/assets/javascripts/discourse/routes/group-activity-mentions.js.es6
new file mode 100644
index 00000000000..48f4fc7d9d5
--- /dev/null
+++ b/app/assets/javascripts/discourse/routes/group-activity-mentions.js.es6
@@ -0,0 +1,3 @@
+import { buildGroupPage } from 'discourse/routes/group-activity-posts';
+
+export default buildGroupPage('mentions');
diff --git a/app/assets/javascripts/discourse/routes/group-activity-messages.js.es6 b/app/assets/javascripts/discourse/routes/group-activity-messages.js.es6
new file mode 100644
index 00000000000..660a5c7cd5f
--- /dev/null
+++ b/app/assets/javascripts/discourse/routes/group-activity-messages.js.es6
@@ -0,0 +1,3 @@
+import { buildGroupPage } from 'discourse/routes/group-activity-posts';
+
+export default buildGroupPage('messages');
diff --git a/app/assets/javascripts/discourse/routes/group-posts.js.es6 b/app/assets/javascripts/discourse/routes/group-activity-posts.js.es6
similarity index 79%
rename from app/assets/javascripts/discourse/routes/group-posts.js.es6
rename to app/assets/javascripts/discourse/routes/group-activity-posts.js.es6
index 25ee29e4dd0..03cd7ec1147 100644
--- a/app/assets/javascripts/discourse/routes/group-posts.js.es6
+++ b/app/assets/javascripts/discourse/routes/group-activity-posts.js.es6
@@ -11,12 +11,12 @@ export function buildGroupPage(type) {
},
setupController(controller, model) {
- this.controllerFor('group-posts').setProperties({ model, type });
+ this.controllerFor('group-activity-posts').setProperties({ model, type });
this.controllerFor("group").set("showing", type);
},
renderTemplate() {
- this.render('group-posts');
+ this.render('group-activity-posts');
},
actions: {
diff --git a/app/assets/javascripts/discourse/routes/group-activity-topics.js.es6 b/app/assets/javascripts/discourse/routes/group-activity-topics.js.es6
new file mode 100644
index 00000000000..16164a51bb3
--- /dev/null
+++ b/app/assets/javascripts/discourse/routes/group-activity-topics.js.es6
@@ -0,0 +1,3 @@
+import { buildGroupPage } from 'discourse/routes/group-activity-posts';
+
+export default buildGroupPage('topics');
diff --git a/app/assets/javascripts/discourse/routes/group-activity.js.es6 b/app/assets/javascripts/discourse/routes/group-activity.js.es6
new file mode 100644
index 00000000000..84011db59f4
--- /dev/null
+++ b/app/assets/javascripts/discourse/routes/group-activity.js.es6
@@ -0,0 +1,5 @@
+export default Ember.Route.extend({
+ beforeModel: function() {
+ this.transitionTo("group.activity.posts");
+ }
+});
diff --git a/app/assets/javascripts/discourse/routes/group-edit.js.es6 b/app/assets/javascripts/discourse/routes/group-edit.js.es6
new file mode 100644
index 00000000000..8608e6ecf3b
--- /dev/null
+++ b/app/assets/javascripts/discourse/routes/group-edit.js.es6
@@ -0,0 +1,15 @@
+export default Ember.Route.extend({
+ titleToken() {
+ return I18n.t('groups.edit.title');
+ },
+
+ model() {
+ return this.modelFor('group');
+ },
+
+ setupController(controller, model) {
+ this.controllerFor('group-edit').setProperties({ model });
+ this.controllerFor("group").set("showing", 'edit');
+ model.findMembers();
+ }
+});
diff --git a/app/assets/javascripts/discourse/routes/group-index.js.es6 b/app/assets/javascripts/discourse/routes/group-index.js.es6
index 5182e0978cf..003a4a8d9e1 100644
--- a/app/assets/javascripts/discourse/routes/group-index.js.es6
+++ b/app/assets/javascripts/discourse/routes/group-index.js.es6
@@ -1,5 +1,4 @@
export default Discourse.Route.extend({
-
titleToken() {
return I18n.t('groups.members');
},
@@ -11,6 +10,6 @@ export default Discourse.Route.extend({
setupController(controller, model) {
this.controllerFor("group").set("showing", "members");
controller.set("model", model);
- model.findMembers();
+ controller.refreshMembers();
}
});
diff --git a/app/assets/javascripts/discourse/routes/group-logs.js.es6 b/app/assets/javascripts/discourse/routes/group-logs.js.es6
new file mode 100644
index 00000000000..0d365fab188
--- /dev/null
+++ b/app/assets/javascripts/discourse/routes/group-logs.js.es6
@@ -0,0 +1,20 @@
+export default Ember.Route.extend({
+ titleToken() {
+ return I18n.t('groups.logs');
+ },
+
+ model() {
+ return this.modelFor('group').findLogs();
+ },
+
+ setupController(controller, model) {
+ this.controllerFor('group-logs').setProperties({ model });
+ this.controllerFor("group").set("showing", 'logs');
+ },
+
+ actions: {
+ willTransition() {
+ this.controllerFor('group-logs').reset();
+ }
+ }
+});
diff --git a/app/assets/javascripts/discourse/routes/group-mentions.js.es6 b/app/assets/javascripts/discourse/routes/group-mentions.js.es6
deleted file mode 100644
index 2a12734dc18..00000000000
--- a/app/assets/javascripts/discourse/routes/group-mentions.js.es6
+++ /dev/null
@@ -1,3 +0,0 @@
-import { buildGroupPage } from 'discourse/routes/group-posts';
-
-export default buildGroupPage('mentions');
diff --git a/app/assets/javascripts/discourse/routes/group-messages.js.es6 b/app/assets/javascripts/discourse/routes/group-messages.js.es6
deleted file mode 100644
index c800d6f7774..00000000000
--- a/app/assets/javascripts/discourse/routes/group-messages.js.es6
+++ /dev/null
@@ -1,3 +0,0 @@
-import { buildGroupPage } from 'discourse/routes/group-posts';
-
-export default buildGroupPage('messages');
diff --git a/app/assets/javascripts/discourse/routes/group-topics.js.es6 b/app/assets/javascripts/discourse/routes/group-topics.js.es6
deleted file mode 100644
index be4e87077e9..00000000000
--- a/app/assets/javascripts/discourse/routes/group-topics.js.es6
+++ /dev/null
@@ -1,3 +0,0 @@
-import { buildGroupPage } from 'discourse/routes/group-posts';
-
-export default buildGroupPage('topics');
diff --git a/app/assets/javascripts/discourse/routes/group.js.es6 b/app/assets/javascripts/discourse/routes/group.js.es6
index 51724c18b45..3df20f794bf 100644
--- a/app/assets/javascripts/discourse/routes/group.js.es6
+++ b/app/assets/javascripts/discourse/routes/group.js.es6
@@ -14,12 +14,6 @@ export default Discourse.Route.extend({
return { name: model.get('name').toLowerCase() };
},
- afterModel(model) {
- return Group.findGroupCounts(model.get('name')).then(counts => {
- this.set('counts', counts);
- });
- },
-
setupController(controller, model) {
controller.setProperties({ model, counts: this.get('counts') });
}
diff --git a/app/assets/javascripts/discourse/routes/groups.js.es6 b/app/assets/javascripts/discourse/routes/groups.js.es6
new file mode 100644
index 00000000000..582ebe0f5c6
--- /dev/null
+++ b/app/assets/javascripts/discourse/routes/groups.js.es6
@@ -0,0 +1,13 @@
+export default Discourse.Route.extend({
+ titleToken() {
+ return I18n.t('groups.index.title');
+ },
+
+ model(params) {
+ return this.store.findAll('group', params);
+ },
+
+ setupController(controller, model) {
+ controller.set('groups', model);
+ }
+});
diff --git a/app/assets/javascripts/discourse/routes/loading.js.es6 b/app/assets/javascripts/discourse/routes/loading.js.es6
deleted file mode 100644
index 9d032c9e3ba..00000000000
--- a/app/assets/javascripts/discourse/routes/loading.js.es6
+++ /dev/null
@@ -1 +0,0 @@
-export default Ember.Route.extend();
diff --git a/app/assets/javascripts/discourse/routes/new-message.js.es6 b/app/assets/javascripts/discourse/routes/new-message.js.es6
index d8e8c577511..85731a8e827 100644
--- a/app/assets/javascripts/discourse/routes/new-message.js.es6
+++ b/app/assets/javascripts/discourse/routes/new-message.js.es6
@@ -21,11 +21,11 @@ export default Discourse.Route.extend({
});
} else if (params.groupname) {
// send a message to a group
- Group.find(params.groupname).then(group => {
- if (group.mentionable) {
- Ember.run.next(() => e.send("createNewMessageViaParams", group.name, params.title, params.body));
+ Group.mentionable(params.groupname).then(result => {
+ if (result.mentionable) {
+ Ember.run.next(() => e.send("createNewMessageViaParams", params.groupname, params.title, params.body));
} else {
- bootbox.alert(I18n.t("composer.cant_send_pm", { username: group.name }));
+ bootbox.alert(I18n.t("composer.cant_send_pm", { username: params.groupname }));
}
}).catch(function() {
bootbox.alert(I18n.t("generic_error"));
diff --git a/app/assets/javascripts/discourse/routes/tags-intersection.js.es6 b/app/assets/javascripts/discourse/routes/tags-intersection.js.es6
new file mode 100644
index 00000000000..5b0e7d8e9ff
--- /dev/null
+++ b/app/assets/javascripts/discourse/routes/tags-intersection.js.es6
@@ -0,0 +1,9 @@
+import TagsShowRoute from 'discourse/routes/tags-show';
+
+export default TagsShowRoute.extend({});
+
+// The tags-intersection route is exactly the same as the tags-show route, but the wildcard at the
+// end of the route (*additional_tags) will cause a match when query parameters are present,
+// breaking all other tags-show routes. Ember thinks the query params are addition tags and should
+// be handled by the intersection logic. Defining tags-intersection as something separate avoids
+// that confusion.
diff --git a/app/assets/javascripts/discourse/routes/tags-show.js.es6 b/app/assets/javascripts/discourse/routes/tags-show.js.es6
index a828e39c68e..db344ef8840 100644
--- a/app/assets/javascripts/discourse/routes/tags-show.js.es6
+++ b/app/assets/javascripts/discourse/routes/tags-show.js.es6
@@ -14,6 +14,14 @@ export default Discourse.Route.extend({
var tag = this.store.createRecord("tag", { id: Handlebars.Utils.escapeExpression(params.tag_id) }),
f = '';
+ if (params.additional_tags) {
+ this.set("additionalTags", params.additional_tags.split('/').map((t) => {
+ return this.store.createRecord("tag", { id: Handlebars.Utils.escapeExpression(t) }).id;
+ }));
+ } else {
+ this.set('additionalTags', null);
+ }
+
if (params.category) {
f = 'c/';
if (params.parent_category) { f += params.parent_category + '/'; }
@@ -56,6 +64,9 @@ export default Discourse.Route.extend({
}
this.set('category', category);
+ } else if (this.get("additionalTags")) {
+ params.filter = `tags/intersection/${tag_id}/${this.get('additionalTags').join('/')}`;
+ this.set('category', null);
} else {
params.filter = `tags/${tag_id}/l/${filter}`;
this.set('category', null);
@@ -64,9 +75,6 @@ export default Discourse.Route.extend({
return findTopicList(this.store, this.topicTrackingState, params.filter, params, {}).then(function(list) {
controller.set('list', list);
controller.set('canCreateTopic', list.get('can_create_topic'));
- if (list.topic_list.tags) {
- Discourse.Site.currentProp('top_tags', list.topic_list.tags);
- }
controller.set('loading', false);
});
},
@@ -94,6 +102,7 @@ export default Discourse.Route.extend({
this.controllerFor('tags.show').setProperties({
model,
tag: model,
+ additionalTags: this.get('additionalTags'),
category: this.get('category'),
filterMode: this.get('filterMode'),
navMode: this.get('navMode'),
@@ -123,7 +132,7 @@ export default Discourse.Route.extend({
// Pre-fill the tags input field
if (controller.get('model.id')) {
var c = self.controllerFor('composer').get('model');
- c.set('tags', [controller.get('model.id')]);
+ c.set('tags', _.flatten([controller.get('model.id')], controller.get('additionalTags')));
}
});
},
@@ -131,16 +140,6 @@ export default Discourse.Route.extend({
didTransition() {
this.controllerFor("tags.show")._showFooter();
return true;
- },
-
- willTransition(transition) {
- if (!Discourse.SiteSettings.show_filter_by_tag) { return true; }
-
- if ((transition.targetName.indexOf("discovery.parentCategory") !== -1 ||
- transition.targetName.indexOf("discovery.category") !== -1) && !transition.queryParams.allTags ) {
- this.transitionTo("/tags" + transition.intent.url + "/" + this.currentModel.get("id"));
- }
- return true;
}
}
});
diff --git a/app/assets/javascripts/discourse/routes/topic-from-params.js.es6 b/app/assets/javascripts/discourse/routes/topic-from-params.js.es6
index 7c96c1a2643..2212da06b94 100644
--- a/app/assets/javascripts/discourse/routes/topic-from-params.js.es6
+++ b/app/assets/javascripts/discourse/routes/topic-from-params.js.es6
@@ -56,8 +56,10 @@ export default Discourse.Route.extend({
ignoreIfChanged: true
});
}
- }).catch(function(e) {
- Ember.warn('Could not view topic', e);
+ }).catch(e => {
+ if (!Ember.testing) {
+ console.log('Could not view topic', e);
+ }
});
}
diff --git a/app/assets/javascripts/discourse/routes/topic.js.es6 b/app/assets/javascripts/discourse/routes/topic.js.es6
index a31736bc158..9cda61f8d7c 100644
--- a/app/assets/javascripts/discourse/routes/topic.js.es6
+++ b/app/assets/javascripts/discourse/routes/topic.js.es6
@@ -14,7 +14,6 @@ const TopicRoute = Discourse.Route.extend({
queryParams: {
filter: { replace: true },
username_filters: { replace: true },
- show_deleted: { replace: true }
},
titleToken() {
@@ -45,7 +44,8 @@ const TopicRoute = Discourse.Route.extend({
this.controllerFor('flag').setProperties({ selected: null, flagTopic: false });
},
- showFlagTopic(model) {
+ showFlagTopic() {
+ const model = this.modelFor('topic');
showModal('flag', { model });
this.controllerFor('flag').setProperties({ selected: null, flagTopic: true });
},
@@ -117,7 +117,6 @@ const TopicRoute = Discourse.Route.extend({
willTransition() {
this._super();
- this.controllerFor("quote-button").deselectText();
Em.run.cancel(scheduledReplace);
isTransitioning = true;
return true;
@@ -139,7 +138,6 @@ const TopicRoute = Discourse.Route.extend({
setupParams(topic, params) {
const postStream = topic.get('postStream');
postStream.set('summary', Em.get(params, 'filter') === 'summary');
- postStream.set('show_deleted', !!Em.get(params, 'show_deleted'));
const usernames = Em.get(params, 'username_filters'),
userFilters = postStream.get('userFilters');
@@ -208,6 +206,7 @@ const TopicRoute = Discourse.Route.extend({
// close the multi select when switching topics
controller.set('multiSelect', false);
+ controller.get('quoteState').clear();
this.controllerFor('composer').set('topic', model);
this.topicTrackingState.trackIncoming('all');
diff --git a/app/assets/javascripts/discourse/routes/unknown.js.es6 b/app/assets/javascripts/discourse/routes/unknown.js.es6
index 7e01606f3be..40c8a301395 100644
--- a/app/assets/javascripts/discourse/routes/unknown.js.es6
+++ b/app/assets/javascripts/discourse/routes/unknown.js.es6
@@ -1,6 +1,7 @@
import { ajax } from 'discourse/lib/ajax';
+
export default Discourse.Route.extend({
- model: function() {
+ model() {
return ajax("/404-body", { dataType: 'html' });
}
});
diff --git a/app/assets/javascripts/discourse/routes/user-activity-bookmarks.js.es6 b/app/assets/javascripts/discourse/routes/user-activity-bookmarks.js.es6
index cb14c181538..49ad23d1bc4 100644
--- a/app/assets/javascripts/discourse/routes/user-activity-bookmarks.js.es6
+++ b/app/assets/javascripts/discourse/routes/user-activity-bookmarks.js.es6
@@ -2,5 +2,6 @@ import UserActivityStreamRoute from "discourse/routes/user-activity-stream";
import UserAction from "discourse/models/user-action";
export default UserActivityStreamRoute.extend({
- userActionType: UserAction.TYPES["bookmarks"]
+ userActionType: UserAction.TYPES["bookmarks"],
+ noContentHelpKey: "user_activity.no_bookmarks"
});
diff --git a/app/assets/javascripts/discourse/routes/user-activity-likes-given.js.es6 b/app/assets/javascripts/discourse/routes/user-activity-likes-given.js.es6
index 13a0e5b9863..89bbbc46b21 100644
--- a/app/assets/javascripts/discourse/routes/user-activity-likes-given.js.es6
+++ b/app/assets/javascripts/discourse/routes/user-activity-likes-given.js.es6
@@ -2,5 +2,6 @@ import UserActivityStreamRoute from "discourse/routes/user-activity-stream";
import UserAction from "discourse/models/user-action";
export default UserActivityStreamRoute.extend({
- userActionType: UserAction.TYPES["likes_given"]
+ userActionType: UserAction.TYPES["likes_given"],
+ noContentHelpKey: 'user_activity.no_likes_given'
});
diff --git a/app/assets/javascripts/discourse/routes/user-activity-stream.js.es6 b/app/assets/javascripts/discourse/routes/user-activity-stream.js.es6
index 7447d712179..4fbf8e4300c 100644
--- a/app/assets/javascripts/discourse/routes/user-activity-stream.js.es6
+++ b/app/assets/javascripts/discourse/routes/user-activity-stream.js.es6
@@ -6,7 +6,7 @@ export default Discourse.Route.extend(ViewingActionType, {
},
afterModel() {
- return this.modelFor("user").get("stream").filterBy(this.get("userActionType"));
+ return this.modelFor("user").get("stream").filterBy(this.get("userActionType"), this.get("noContentHelpKey"));
},
renderTemplate() {
diff --git a/app/assets/javascripts/discourse/routes/user-invited-show.js.es6 b/app/assets/javascripts/discourse/routes/user-invited-show.js.es6
index c9465fa7d14..9be0fc48234 100644
--- a/app/assets/javascripts/discourse/routes/user-invited-show.js.es6
+++ b/app/assets/javascripts/discourse/routes/user-invited-show.js.es6
@@ -33,14 +33,6 @@ export default Discourse.Route.extend({
showInvite() {
showModal("invite", { model: this.currentUser });
this.controllerFor("invite").reset();
- },
-
- uploadSuccess(filename) {
- bootbox.alert(I18n.t("user.invited.bulk_invite.success", { filename: filename }));
- },
-
- uploadError(filename, message) {
- bootbox.alert(I18n.t("user.invited.bulk_invite.error", { filename: filename, message: message }));
}
}
});
diff --git a/app/assets/javascripts/discourse/routes/user.js.es6 b/app/assets/javascripts/discourse/routes/user.js.es6
index fdfb99854da..03bfbb401b0 100644
--- a/app/assets/javascripts/discourse/routes/user.js.es6
+++ b/app/assets/javascripts/discourse/routes/user.js.es6
@@ -19,7 +19,15 @@ export default Discourse.Route.extend({
const isIndexStream = INDEX_STREAM_ROUTES.indexOf(transition.targetName) !== -1;
this.controllerFor('user').set('indexStream', isIndexStream);
return true;
- }
+ },
+
+ undoRevokeApiKey(key) {
+ key.undoRevoke();
+ },
+
+ revokeApiKey(key) {
+ key.revoke();
+ },
},
beforeModel() {
diff --git a/app/assets/javascripts/discourse/templates/about.hbs b/app/assets/javascripts/discourse/templates/about.hbs
index 3d8f993ba08..480b10c0fde 100644
--- a/app/assets/javascripts/discourse/templates/about.hbs
+++ b/app/assets/javascripts/discourse/templates/about.hbs
@@ -1,97 +1,99 @@
-
-
+{{#d-section pageClass="about"}}
+
+
-
-
-
- {{i18n 'about.title' title=model.title}}
- {{model.description}}
-
-
- {{#if model.admins}}
-
- {{i18n 'about.our_admins'}}
-
- {{#each model.admins as |a|}}
- {{user-info user=a}}
- {{/each}}
-
+
+
+ {{i18n 'about.title' title=model.title}}
+ {{model.description}}
- {{/if}}
- {{#if model.moderators}}
-
- {{i18n 'about.our_moderators'}}
+ {{#if model.admins}}
+
+ {{i18n 'about.our_admins'}}
-
- {{#each model.moderators as |m|}}
- {{user-info user=m}}
+ {{#each model.admins as |a|}}
+ {{user-info user=a}}
{{/each}}
-
-
+
+
+
+ {{/if}}
+
+ {{#if model.moderators}}
+
+ {{i18n 'about.our_moderators'}}
+
+
+ {{#each model.moderators as |m|}}
+ {{user-info user=m}}
+ {{/each}}
+
+
+
+ {{/if}}
+
+
+ {{i18n 'about.stats'}}
+
+
+
+
+ {{i18n 'about.stat.all_time'}}
+ {{i18n 'about.stat.last_7_days'}}
+ {{i18n 'about.stat.last_30_days'}}
+
+
+ {{i18n 'about.topic_count'}}
+ {{number model.stats.topic_count}}
+ {{number model.stats.topics_7_days}}
+ {{number model.stats.topics_30_days}}
+
+
+ {{i18n 'about.post_count'}}
+ {{number model.stats.post_count}}
+ {{number model.stats.posts_7_days}}
+ {{number model.stats.posts_30_days}}
+
+
+ {{i18n 'about.user_count'}}
+ {{number model.stats.user_count}}
+ {{number model.stats.users_7_days}}
+ {{number model.stats.users_30_days}}
+
+
+ {{i18n 'about.active_user_count'}}
+ —
+ {{number model.stats.active_users_7_days}}
+ {{number model.stats.active_users_30_days}}
+
+
+ {{i18n 'about.like_count'}}
+ {{number model.stats.like_count}}
+ {{number model.stats.likes_7_days}}
+ {{number model.stats.likes_30_days}}
+
+
- {{/if}}
-
- {{i18n 'about.stats'}}
-
-
-
-
- {{i18n 'about.stat.all_time'}}
- {{i18n 'about.stat.last_7_days'}}
- {{i18n 'about.stat.last_30_days'}}
-
-
- {{i18n 'about.topic_count'}}
- {{number model.stats.topic_count}}
- {{number model.stats.topics_7_days}}
- {{number model.stats.topics_30_days}}
-
-
- {{i18n 'about.post_count'}}
- {{number model.stats.post_count}}
- {{number model.stats.posts_7_days}}
- {{number model.stats.posts_30_days}}
-
-
- {{i18n 'about.user_count'}}
- {{number model.stats.user_count}}
- {{number model.stats.users_7_days}}
- {{number model.stats.users_30_days}}
-
-
- {{i18n 'about.active_user_count'}}
- —
- {{number model.stats.active_users_7_days}}
- {{number model.stats.active_users_30_days}}
-
-
- {{i18n 'about.like_count'}}
- {{number model.stats.like_count}}
- {{number model.stats.likes_7_days}}
- {{number model.stats.likes_30_days}}
-
-
-
-
- {{#if contactInfo}}
-
- {{i18n 'about.contact'}}
- {{{contactInfo}}}
-
- {{/if}}
+ {{#if contactInfo}}
+
+ {{i18n 'about.contact'}}
+ {{{contactInfo}}}
+
+ {{/if}}
+
-
+{{/d-section}}
diff --git a/app/assets/javascripts/discourse/templates/additional-composer-buttons.hbs b/app/assets/javascripts/discourse/templates/additional-composer-buttons.hbs
deleted file mode 100644
index 43ccd1b392d..00000000000
--- a/app/assets/javascripts/discourse/templates/additional-composer-buttons.hbs
+++ /dev/null
@@ -1 +0,0 @@
-{{!-- THIS IS AN EMPTY TEMPLATE THAT NEEDS TO BE OVERWRITTEN --}}
diff --git a/app/assets/javascripts/discourse/templates/application.hbs b/app/assets/javascripts/discourse/templates/application.hbs
index 43f9add17ba..bf2de38396f 100644
--- a/app/assets/javascripts/discourse/templates/application.hbs
+++ b/app/assets/javascripts/discourse/templates/application.hbs
@@ -1,31 +1,31 @@
-
+{{plugin-outlet name="above-site-header"}}
{{site-header canSignUp=canSignUp
- showCreateAccount="showCreateAccount"
- showLogin="showLogin"
- showKeyboard="showKeyboardShortcutsHelp"
- toggleMobileView="toggleMobileView"
- toggleAnonymous="toggleAnonymous"
- logout="logout"
- showSearchHelp="showSearchHelp"}}
+ showCreateAccount=(action "appRouteAction" "showCreateAccount")
+ showLogin=(action "appRouteAction" "showLogin")
+ showKeyboard=(action "appRouteAction" "showKeyboardShortcutsHelp")
+ toggleMobileView=(action "appRouteAction" "toggleMobileView")
+ toggleAnonymous=(action "appRouteAction" "toggleAnonymous")
+ logout=(action "appRouteAction" "logout")}}
+{{plugin-outlet name="below-site-header"}}
{{#if showTop}}
- {{custom-html "top"}}
+ {{custom-html name="top"}}
{{/if}}
{{global-notice}}
{{create-topics-notice}}
{{outlet}}
- {{render "user-card"}}
+ {{outlet "user-card"}}
-{{plugin-outlet "above-footer"}}
+{{plugin-outlet name="above-footer"}}
{{#if showFooter}}
- {{custom-html "footer"}}
+ {{custom-html name="footer"}}
{{/if}}
-{{plugin-outlet "below-footer"}}
+{{plugin-outlet name="below-footer"}}
-{{render "modal"}}
-{{render "topic-entrance"}}
-{{render "composer"}}
+{{outlet "modal"}}
+{{topic-entrance}}
+{{outlet "composer"}}
diff --git a/app/assets/javascripts/discourse/templates/badge-selector-autocomplete.raw.hbs b/app/assets/javascripts/discourse/templates/badge-selector-autocomplete.raw.hbs
new file mode 100644
index 00000000000..4537c451601
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/badge-selector-autocomplete.raw.hbs
@@ -0,0 +1,7 @@
+
+
+ {{#each options as |option|}}
+ - {{option.name}}
+ {{/each}}
+
+
diff --git a/app/assets/javascripts/discourse/templates/badges/index.hbs b/app/assets/javascripts/discourse/templates/badges/index.hbs
index a5aac17b23a..b30725693b3 100644
--- a/app/assets/javascripts/discourse/templates/badges/index.hbs
+++ b/app/assets/javascripts/discourse/templates/badges/index.hbs
@@ -1,17 +1,19 @@
-
- {{i18n 'badges.title'}}
+{{#d-section pageClass="badges"}}
+
+ {{i18n 'badges.title'}}
-
- {{#each badgeGroups as |bg|}}
-
-
- {{bg.badgeGrouping.displayName}}
+
+ {{#each badgeGroups as |bg|}}
+
+
+ {{bg.badgeGrouping.displayName}}
+
+
+ {{#each bg.badges as |b|}}
+ {{badge-card badge=b navigateOnClick="true"}}
+ {{/each}}
-
- {{#each bg.badges as |b|}}
- {{badge-card badge=b navigateOnClick="true"}}
- {{/each}}
-
- {{/each}}
+ {{/each}}
+
-
+{{/d-section}}
diff --git a/app/assets/javascripts/discourse/templates/category-group-autocomplete.raw.hbs b/app/assets/javascripts/discourse/templates/category-selector-autocomplete.raw.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/category-group-autocomplete.raw.hbs
rename to app/assets/javascripts/discourse/templates/category-selector-autocomplete.raw.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/badge-selector.hbs b/app/assets/javascripts/discourse/templates/components/badge-selector.hbs
new file mode 100644
index 00000000000..c1c29859e26
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/badge-selector.hbs
@@ -0,0 +1 @@
+
diff --git a/app/assets/javascripts/discourse/templates/components/basic-topic-list.hbs b/app/assets/javascripts/discourse/templates/components/basic-topic-list.hbs
index 895708915d1..c174d4a9b42 100644
--- a/app/assets/javascripts/discourse/templates/components/basic-topic-list.hbs
+++ b/app/assets/javascripts/discourse/templates/components/basic-topic-list.hbs
@@ -7,7 +7,8 @@
expandExcerpts=expandExcerpts
bulkSelectEnabled=bulkSelectEnabled
canBulkSelect=canBulkSelect
- selected=selected}}
+ selected=selected
+ skipHeader=skipHeader}}
{{else}}
{{#unless loadingMore}}
diff --git a/app/assets/javascripts/discourse/templates/components/bread-crumbs.hbs b/app/assets/javascripts/discourse/templates/components/bread-crumbs.hbs
index f737c969760..bbf8ef4caba 100644
--- a/app/assets/javascripts/discourse/templates/components/bread-crumbs.hbs
+++ b/app/assets/javascripts/discourse/templates/components/bread-crumbs.hbs
@@ -8,6 +8,6 @@
{{tag-drop firstCategory=firstCategory secondCategory=secondCategory tagId=tagId}}
{{/if}}
-{{plugin-outlet "bread-crumbs-right" tagName="li"}}
+{{plugin-outlet name="bread-crumbs-right" connectorTagName="li"}}
diff --git a/app/assets/javascripts/discourse/templates/components/categories-and-latest-topics.hbs b/app/assets/javascripts/discourse/templates/components/categories-and-latest-topics.hbs
new file mode 100644
index 00000000000..c837733c189
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/categories-and-latest-topics.hbs
@@ -0,0 +1,29 @@
+{{categories-only categories=categories}}
+
+
+
+
+ {{i18n "filters.latest.title"}}
+
+
+
+ {{#if topics}}
+ {{#each topics as |t|}}
+ {{latest-topic-list-item topic=t}}
+ {{/each}}
+
+
+ {{i18n "more"}}
+
+
+ {{else}}
+
+
+ {{i18n "topics.none.latest"}}
+
+
+ {{/if}}
+
+
+
+
diff --git a/app/assets/javascripts/discourse/templates/components/categories-only.hbs b/app/assets/javascripts/discourse/templates/components/categories-only.hbs
new file mode 100644
index 00000000000..f2db6778627
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/categories-only.hbs
@@ -0,0 +1,49 @@
+{{#if categories}}
+
+
+
+ {{i18n 'categories.category'}}
+ {{i18n 'categories.topics'}}
+ {{#if showTopics}}
+ {{i18n 'categories.latest'}}
+ {{/if}}
+
+
+
+ {{#each categories as |c|}}
+
+
+
+ {{category-title-link category=c}}
+
+ {{{c.description_excerpt}}}
+
+
+
+ {{#if c.subcategories}}
+
+ {{#each c.subcategories as |s|}}
+
+ {{category-link s hideParent="true"}}
+ {{category-unread category=s}}
+
+ {{/each}}
+
+ {{/if}}
+
+
+ {{{c.stat}}}
+ {{category-unread category=c tagName="div" class="unread-new"}}
+
+ {{#if showTopics}}
+
+ {{#each c.featuredTopics as |t|}}
+ {{featured-topic topic=t latestTopicOnly=latestTopicOnly}}
+ {{/each}}
+
+ {{/if}}
+
+ {{/each}}
+
+
+{{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/categories-with-featured-topics.hbs b/app/assets/javascripts/discourse/templates/components/categories-with-featured-topics.hbs
new file mode 100644
index 00000000000..9243d150285
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/categories-with-featured-topics.hbs
@@ -0,0 +1,3 @@
+{{categories-only categories=categories
+ latestTopicOnly=latestTopicOnly
+ showTopics="true"}}
diff --git a/app/assets/javascripts/discourse/templates/components/category-drop.hbs b/app/assets/javascripts/discourse/templates/components/category-drop.hbs
index ee2c7c72aa4..9e9cc410e57 100644
--- a/app/assets/javascripts/discourse/templates/components/category-drop.hbs
+++ b/app/assets/javascripts/discourse/templates/components/category-drop.hbs
@@ -16,7 +16,7 @@
{{#if categories}}
-
+
{{#if subCategory}}
diff --git a/app/assets/javascripts/discourse/templates/components/category-group.hbs b/app/assets/javascripts/discourse/templates/components/category-group.hbs
deleted file mode 100644
index e3c47acdff7..00000000000
--- a/app/assets/javascripts/discourse/templates/components/category-group.hbs
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/app/assets/javascripts/discourse/templates/components/category-selector.hbs b/app/assets/javascripts/discourse/templates/components/category-selector.hbs
new file mode 100644
index 00000000000..a265ef5f12b
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/category-selector.hbs
@@ -0,0 +1 @@
+
diff --git a/app/assets/javascripts/discourse/templates/components/category-title-link.hbs b/app/assets/javascripts/discourse/templates/components/category-title-link.hbs
new file mode 100644
index 00000000000..49e3b088f18
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/category-title-link.hbs
@@ -0,0 +1,11 @@
+
+ {{#if category.read_restricted}}
+ {{fa-icon 'lock'}}
+ {{/if}}
+
+ {{category.name}}
+
+ {{#if category.uploaded_logo.url}}
+ {{cdn-img src=category.uploaded_logo.url class="category-logo"}}
+ {{/if}}
+
diff --git a/app/assets/javascripts/discourse/templates/components/check-mark.hbs b/app/assets/javascripts/discourse/templates/components/check-mark.hbs
new file mode 100644
index 00000000000..85c38d59ac1
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/check-mark.hbs
@@ -0,0 +1,5 @@
+{{#if checked}}
+ {{fa-icon "check"}}
+{{else}}
+ {{fa-icon "times"}}
+{{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/color-picker.hbs b/app/assets/javascripts/discourse/templates/components/color-picker.hbs
new file mode 100644
index 00000000000..5842bf91512
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/color-picker.hbs
@@ -0,0 +1 @@
+{{#each colors as |c|}}{{color-picker-choice color=c usedColors=usedColors selectColor="selectColor"}}{{/each}}
diff --git a/app/assets/javascripts/discourse/templates/components/composer-title.hbs b/app/assets/javascripts/discourse/templates/components/composer-title.hbs
index 1294aa29661..7da7bb6ec38 100644
--- a/app/assets/javascripts/discourse/templates/components/composer-title.hbs
+++ b/app/assets/javascripts/discourse/templates/components/composer-title.hbs
@@ -2,7 +2,7 @@
tabindex="2"
id="reply-title"
maxLength=siteSettings.max_topic_title_length
- placeholderKey="composer.title_placeholder"
+ placeholderKey=composer.titlePlaceholder
disabled=composer.loading}}
{{popup-input-tip validation=validation}}
diff --git a/app/assets/javascripts/discourse/templates/components/conditional-loading-spinner.hbs b/app/assets/javascripts/discourse/templates/components/conditional-loading-spinner.hbs
new file mode 100644
index 00000000000..e18527be3a8
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/conditional-loading-spinner.hbs
@@ -0,0 +1,5 @@
+{{#if condition}}
+
+{{else}}
+ {{yield}}
+{{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/csv-uploader.hbs b/app/assets/javascripts/discourse/templates/components/csv-uploader.hbs
new file mode 100644
index 00000000000..a29839a7909
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/csv-uploader.hbs
@@ -0,0 +1,7 @@
+
+{{#if uploading}}
+ {{i18n 'upload_selector.uploading'}} {{uploadProgress}}%
+{{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/custom-html-container.hbs b/app/assets/javascripts/discourse/templates/components/custom-html-container.hbs
new file mode 100644
index 00000000000..81eb3c4f9b0
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/custom-html-container.hbs
@@ -0,0 +1 @@
+{{html}}
diff --git a/app/assets/javascripts/discourse/templates/components/d-button.hbs b/app/assets/javascripts/discourse/templates/components/d-button.hbs
new file mode 100644
index 00000000000..47b714b8dc1
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/d-button.hbs
@@ -0,0 +1,6 @@
+{{#if icon}}
+ {{fa-icon icon}}
+{{/if}}
+
+{{{translatedLabel}}}
+{{yield}}
diff --git a/app/assets/javascripts/discourse/templates/components/d-checkbox.hbs b/app/assets/javascripts/discourse/templates/components/d-checkbox.hbs
index b4bbae64a24..f39a68e79c9 100644
--- a/app/assets/javascripts/discourse/templates/components/d-checkbox.hbs
+++ b/app/assets/javascripts/discourse/templates/components/d-checkbox.hbs
@@ -1,2 +1,2 @@
-{{input type="checkbox" checked=checked}}
+
{{i18n label}}
diff --git a/app/assets/javascripts/discourse/templates/components/d-editor.hbs b/app/assets/javascripts/discourse/templates/components/d-editor.hbs
index 27119b84d6d..dacde9aa740 100644
--- a/app/assets/javascripts/discourse/templates/components/d-editor.hbs
+++ b/app/assets/javascripts/discourse/templates/components/d-editor.hbs
@@ -11,7 +11,7 @@
{{#each toolbar.groups as |group|}}
{{#each group.buttons as |b|}}
- {{d-button action=b.action actionParam=b translatedTitle=b.title icon=b.icon class=b.className}}
+ {{d-button action=b.action actionParam=b translatedTitle=b.title label=b.label icon=b.icon class=b.className}}
{{/each}}
{{#unless group.lastGroup}}
diff --git a/app/assets/javascripts/discourse/templates/components/discourse-banner.hbs b/app/assets/javascripts/discourse/templates/components/discourse-banner.hbs
index 1a647c5ea82..306f2924b44 100644
--- a/app/assets/javascripts/discourse/templates/components/discourse-banner.hbs
+++ b/app/assets/javascripts/discourse/templates/components/discourse-banner.hbs
@@ -1,11 +1,13 @@
-
-
{{else}}
-
- {{format-age topic.last_posted_at}}
+ {{format-age topic.last_posted_at}}
{{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/flag-selection.hbs b/app/assets/javascripts/discourse/templates/components/flag-selection.hbs
new file mode 100644
index 00000000000..4aadb91c823
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/flag-selection.hbs
@@ -0,0 +1,5 @@
+{{#each flags as |f|}}
+ {{yield f}}
+{{else}}
+ {{i18n 'flagging.cant'}}
+{{/each}}
diff --git a/app/assets/javascripts/discourse/templates/components/generated-invite-link.hbs b/app/assets/javascripts/discourse/templates/components/generated-invite-link.hbs
new file mode 100644
index 00000000000..09d02aae71a
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/generated-invite-link.hbs
@@ -0,0 +1,5 @@
+{{i18n "user.invited.link_generated"}}
+
+
+
+{{i18n "user.invited.valid_for" email=email}}
diff --git a/app/assets/javascripts/discourse/templates/components/group-flair-inputs.hbs b/app/assets/javascripts/discourse/templates/components/group-flair-inputs.hbs
new file mode 100644
index 00000000000..5693422c4d5
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/group-flair-inputs.hbs
@@ -0,0 +1,47 @@
+
+
+
+ {{text-field name="flair_url"
+ value=model.flair_url
+ placeholderKey="groups.flair_url_placeholder"}}
+
+
+
+
+ {{text-field name="flair_bg_color"
+ class="group-flair-bg-color"
+ value=model.flair_bg_color
+ placeholderKey="groups.flair_bg_color_placeholder"}}
+
+
+ {{#if flairPreviewIcon}}
+
+
+ {{text-field name="flair_color"
+ class="group-flair-color"
+ value=model.flair_color
+ placeholderKey="groups.flair_color_placeholder"}}
+
+ {{/if}}
+
+
+ {{i18n 'groups.flair_note'}}
+
+
+
+
+
+
+
+ 
+
+
+ {{#if flairPreviewImage}}
+
+ {{else}}
+
+
+
+ {{/if}}
+
+
diff --git a/app/assets/javascripts/discourse/templates/components/group-logs-filter.hbs b/app/assets/javascripts/discourse/templates/components/group-logs-filter.hbs
new file mode 100644
index 00000000000..11c1eb7b558
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/group-logs-filter.hbs
@@ -0,0 +1,6 @@
+{{#if value}}
+ {{#d-button class="btn-small group-logs-filter" action="clearFilter" actionParam=type}}
+ {{label}}: {{filterText}}
+ {{fa-icon "times-circle"}}
+ {{/d-button}}
+{{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/group-logs-row.hbs b/app/assets/javascripts/discourse/templates/components/group-logs-row.hbs
new file mode 100644
index 00000000000..31d63039952
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/group-logs-row.hbs
@@ -0,0 +1,59 @@
+
+
+ {{#d-button class="btn-small" action="filter" actionParam=(hash value=log.action key="action")}}
+ {{log.actionTitle}}
+ {{/d-button}}
+
+
+
+ {{avatar log.acting_user imageSize='tiny'}}
+
+ {{#d-button class="btn-small" action="filter" actionParam=(hash value=log.acting_user.username key="acting_user")}}
+ {{log.acting_user.username}}
+ {{/d-button}}
+
+
+
+ {{#if log.target_user}}
+ {{avatar log.target_user imageSize='tiny'}}
+
+ {{#d-button class="btn-small" action="filter" actionParam=(hash value=log.target_user.username key="target_user")}}
+ {{log.target_user.username}}
+ {{/d-button}}
+ {{/if}}
+
+
+
+ {{#if log.subject}}
+ {{#d-button class="btn-small" action="filter" actionParam=(hash value=log.subject key="subject")}}
+ {{log.subject}}
+ {{/d-button}}
+ {{/if}}
+
+
+ {{bound-date log.created_at}}
+
+
+ {{#if log.prev_value}}
+ {{#if expandDetails}}
+ {{fa-icon 'ellipsis-v'}}
+ {{else}}
+ {{fa-icon 'ellipsis-h'}}
+ {{/if}}
+ {{/if}}
+
+
+
+{{#if expandDetails}}
+
+
+
+ {{i18n 'groups.logs.from'}}: {{log.prev_value}}
+
+
+
+ {{i18n 'groups.logs.to'}}: {{log.new_value}}
+
+
+
+{{/if}}
diff --git a/app/assets/javascripts/admin/templates/components/group-member.hbs b/app/assets/javascripts/discourse/templates/components/group-member.hbs
similarity index 100%
rename from app/assets/javascripts/admin/templates/components/group-member.hbs
rename to app/assets/javascripts/discourse/templates/components/group-member.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/group-members-input.hbs b/app/assets/javascripts/discourse/templates/components/group-members-input.hbs
new file mode 100644
index 00000000000..c720c630f53
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/group-members-input.hbs
@@ -0,0 +1,23 @@
+
+
+ {{fa-icon "fast-backward"}}
+ {{currentPage}}/{{totalPages}}
+ {{fa-icon "fast-forward"}}
+
+
+ {{#each model.members as |member|}}
+ {{group-member member=member automatic=model.automatic removeAction="removeMember"}}
+ {{/each}}
+
+
+{{#unless model.automatic}}
+
+ {{user-selector usernames=model.usernames}}
+
+ {{d-button action="addMembers"
+ class="add"
+ icon="plus"
+ disabled=disableAddButton
+ label="groups.edit.add_members"}}
+
+{{/unless}}
diff --git a/app/assets/javascripts/discourse/templates/components/group-membership-button.hbs b/app/assets/javascripts/discourse/templates/components/group-membership-button.hbs
new file mode 100644
index 00000000000..1fc14e88970
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/group-membership-button.hbs
@@ -0,0 +1,32 @@
+{{#if canJoinGroup}}
+ {{#if userIsGroupUser}}
+ {{d-button action="leaveGroup"
+ class="btn-danger group-index-leave"
+ icon="minus"
+ label="groups.leave"
+ disabled=updatingMembership}}
+ {{else}}
+ {{d-button action=joinGroupAction
+ class="group-index-join"
+ icon="plus"
+ label="groups.join"
+ disabled=updatingMembership}}
+ {{/if}}
+{{else if canRequestMembership}}
+ {{#if userIsGroupUser}}
+ {{#if showMembershipStatus}}
+ {{d-button
+ class="btn-primary"
+ icon="user"
+ label="groups.is_group_user"
+ disabled=true}}
+ {{/if}}
+ {{else}}
+ {{d-button action=requestMembershipAction
+ class="group-index-request"
+ icon="envelope"
+ label="groups.request"}}
+ {{/if}}
+{{else}}
+ {{yield}}
+{{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/group-post-stream.js.hbs b/app/assets/javascripts/discourse/templates/components/group-post-stream.js.hbs
index 9ab4c17c68c..a67a93d4e59 100644
--- a/app/assets/javascripts/discourse/templates/components/group-post-stream.js.hbs
+++ b/app/assets/javascripts/discourse/templates/components/group-post-stream.js.hbs
@@ -7,3 +7,5 @@
{{/each}}
{{/load-more}}
+
+{{conditional-loading-spinner condition=loading}}
diff --git a/app/assets/javascripts/discourse/templates/components/group-post.hbs b/app/assets/javascripts/discourse/templates/components/group-post.hbs
index 45a16422810..09ac259ce27 100644
--- a/app/assets/javascripts/discourse/templates/components/group-post.hbs
+++ b/app/assets/javascripts/discourse/templates/components/group-post.hbs
@@ -7,12 +7,12 @@
{{category-link post.category}}
- {{#if post.user_long_name}}
- {{post.user_long_name}}{{#if post.user_title}}, {{post.user_title}}{{/if}}
+ {{#if post.user.name}}
+ {{post.user.name}}{{#if post.user.title}}, {{post.user.title}}{{/if}}
{{/if}}
- {{{unbound post.cooked}}}
+ {{{unbound post.excerpt}}}
diff --git a/app/assets/javascripts/discourse/templates/components/group-selector.hbs b/app/assets/javascripts/discourse/templates/components/group-selector.hbs
index 2ae1e71d111..af73c13cbca 100644
--- a/app/assets/javascripts/discourse/templates/components/group-selector.hbs
+++ b/app/assets/javascripts/discourse/templates/components/group-selector.hbs
@@ -1 +1 @@
-
+
diff --git a/app/assets/javascripts/discourse/templates/components/latest-topic-list-item.hbs b/app/assets/javascripts/discourse/templates/components/latest-topic-list-item.hbs
new file mode 100644
index 00000000000..e42241f0bb3
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/latest-topic-list-item.hbs
@@ -0,0 +1,39 @@
+
+
+
+
+ {{#with topic.lastPoster as |lastPoster|}}
+ {{#user-link user=lastPoster}}
+ {{avatar lastPoster imageSize="large"}}
+ {{/user-link}}
+ {{/with}}
+
+
+
+ {{topic-status topic=topic}}
+ {{topic-link topic}}
+ {{#if topic.featured_link}}
+ {{topic-featured-link topic}}
+ {{/if}}
+ {{topic-post-badges newPosts=topic.totalUnread unseen=topic.unseen url=topic.lastUnreadUrl}}
+
+
+ {{category-link topic.category}}
+ {{#if topic.tags}}
+
+ {{/if}}
+
+
+
+ {{raw "list/posts-count-column" topic=topic tagName="div"}}
+
+
+
+
+
diff --git a/app/assets/javascripts/discourse/templates/components/navigation-bar.hbs b/app/assets/javascripts/discourse/templates/components/navigation-bar.hbs
index e24d25bfb2d..3a2496cc969 100644
--- a/app/assets/javascripts/discourse/templates/components/navigation-bar.hbs
+++ b/app/assets/javascripts/discourse/templates/components/navigation-bar.hbs
@@ -1,4 +1,5 @@
{{#each navItems as |navItem|}}
{{navigation-item content=navItem filterMode=filterMode}}
{{/each}}
-{{custom-html "extraNavItem"}}
+{{custom-html name="extraNavItem"}}
+{{plugin-outlet name="extra-nav-item" connectorTagName="li"}}
diff --git a/app/assets/javascripts/discourse/templates/components/plugin-outlet.hbs b/app/assets/javascripts/discourse/templates/components/plugin-outlet.hbs
new file mode 100644
index 00000000000..73126a2572f
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/plugin-outlet.hbs
@@ -0,0 +1,3 @@
+{{#each connectors as |c|}}
+ {{plugin-connector connector=c args=args class=c.classNames tagName=connectorTagName}}
+{{/each}}
diff --git a/app/assets/javascripts/discourse/templates/components/quote-button.hbs b/app/assets/javascripts/discourse/templates/components/quote-button.hbs
new file mode 100644
index 00000000000..1dce9fb2885
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/quote-button.hbs
@@ -0,0 +1 @@
+{{i18n "post.quote_reply"}}
diff --git a/app/assets/javascripts/discourse/templates/components/search-advanced-options.hbs b/app/assets/javascripts/discourse/templates/components/search-advanced-options.hbs
new file mode 100644
index 00000000000..6df6fcb44da
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/search-advanced-options.hbs
@@ -0,0 +1,83 @@
+
+
+
+
+ {{user-selector
+ excludeCurrentUser=false
+ usernames=searchedTerms.username
+ class="user-selector"
+ single="true"
+ canReceiveUpdates="true"}}
+
+
+
+
+
+ {{category-selector categories=searchedTerms.category single="true"}}
+
+
+
+
+
+
+{{#if siteSettings.tagging_enabled}}
+
+
+
+
+ {{tag-chooser tags=searchedTerms.tags blacklist=searchedTerms.tags allowCreate=false placeholder="" everyTag="true" unlimitedTagCount="true" width="70%"}}
+
+
+
+{{/if}}
+
+
+
+
+
+
+
+
+
+
+ {{combo-box id="in" valueAttribute="value" content=inOptions value=searchedTerms.in none="user.locale.any"}}
+
+
+
+
+
+ {{combo-box id="status" valueAttribute="value" content=statusOptions value=searchedTerms.status none="user.locale.any"}}
+
+
+
+
+
+
+
+
+ {{combo-box id="postTime" valueAttribute="value" content=postTimeOptions value=searchedTerms.time.when}}
+ {{input type="date" value=searchedTerms.time.days class="input-small" id='search-post-date'}}
+
+
+
+
+
+ {{input type="number" value=searchedTerms.min_post_count class="input-small" id='search-min-post-count'}}
+
+
+
diff --git a/app/assets/javascripts/discourse/templates/components/share-popup.hbs b/app/assets/javascripts/discourse/templates/components/share-popup.hbs
new file mode 100644
index 00000000000..65e1c5d3c6e
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/share-popup.hbs
@@ -0,0 +1,24 @@
+{{shareTitle}}
+
+{{#if date}}
+ {{displayDate}}
+{{/if}}
+
+
+
+
+
+
+{{#each sources as |s|}}
+ {{share-source source=s title=model.title action="share"}}
+{{/each}}
+
+{{#if topic.details.can_reply_as_new_topic}}
+
+{{/if}}
+
+
diff --git a/app/assets/javascripts/discourse/templates/components/stream-item.hbs b/app/assets/javascripts/discourse/templates/components/stream-item.hbs
index 0018f8a2d84..fed530753ef 100644
--- a/app/assets/javascripts/discourse/templates/components/stream-item.hbs
+++ b/app/assets/javascripts/discourse/templates/components/stream-item.hbs
@@ -6,7 +6,7 @@
{{{item.title}}}
{{category-link item.category}}
- {{plugin-outlet "user-stream-item-header"}}
+ {{plugin-outlet name="user-stream-item-header" args=(hash item=item)}}
{{#if actionDescription}}
diff --git a/app/assets/javascripts/discourse/templates/components/tag-drop-link.hbs b/app/assets/javascripts/discourse/templates/components/tag-drop-link.hbs
new file mode 100644
index 00000000000..e8adb89fe43
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/tag-drop-link.hbs
@@ -0,0 +1 @@
+{{tagId}}
diff --git a/app/assets/javascripts/discourse/templates/components/text-overflow.hbs b/app/assets/javascripts/discourse/templates/components/text-overflow.hbs
new file mode 100644
index 00000000000..05a44390298
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/text-overflow.hbs
@@ -0,0 +1 @@
+{{{text}}}
diff --git a/app/assets/javascripts/discourse/templates/components/toggle-deleted.hbs b/app/assets/javascripts/discourse/templates/components/toggle-deleted.hbs
deleted file mode 100644
index 5475461580c..00000000000
--- a/app/assets/javascripts/discourse/templates/components/toggle-deleted.hbs
+++ /dev/null
@@ -1,7 +0,0 @@
-{{#if postStream.show_deleted}}
- {{i18n 'deleted_filter.disabled_description'}}
-
-{{else}}
- {{i18n 'deleted_filter.enabled_description'}}
-
-{{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/topic-category.hbs b/app/assets/javascripts/discourse/templates/components/topic-category.hbs
index c3114225607..edf11686ba9 100644
--- a/app/assets/javascripts/discourse/templates/components/topic-category.hbs
+++ b/app/assets/javascripts/discourse/templates/components/topic-category.hbs
@@ -2,12 +2,16 @@
{{bound-category-link topic.category.parentCategory}}
{{/if}}
{{bound-category-link topic.category hideParent=true}}
-{{#if siteSettings.tagging_enabled}}
-
-{{/if}}
-
-{{plugin-outlet "topic-category"}}
+
+ {{#if siteSettings.tagging_enabled}}
+
+ {{/if}}
+ {{#if siteSettings.topic_featured_link_enabled}}
+ {{topic-featured-link topic}}
+ {{/if}}
+
+{{plugin-outlet name="topic-category" args=(hash topic=topic category=topic.category)}}
diff --git a/app/assets/javascripts/discourse/templates/topic-entrance.hbs b/app/assets/javascripts/discourse/templates/components/topic-entrance.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/topic-entrance.hbs
rename to app/assets/javascripts/discourse/templates/components/topic-entrance.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/topic-footer-buttons.hbs b/app/assets/javascripts/discourse/templates/components/topic-footer-buttons.hbs
new file mode 100644
index 00000000000..ec1e9eac88f
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/topic-footer-buttons.hbs
@@ -0,0 +1,83 @@
+{{#if showAdminButton}}
+ {{topic-admin-menu-button
+ topic=topic
+ openUpwards="true"
+ toggleMultiSelect=toggleMultiSelect
+ deleteTopic=deleteTopic
+ recoverTopic=recoverTopic
+ toggleClosed=toggleClosed
+ toggleArchived=toggleArchived
+ toggleVisibility=toggleVisibility
+ showAutoClose=showAutoClose
+ showFeatureTopic=showFeatureTopic
+ showChangeTimestamp=showChangeTimestamp
+ convertToPublicTopic=convertToPublicTopic
+ convertToPrivateMessage=convertToPrivateMessage}}
+{{/if}}
+
+{{#unless topic.isPrivateMessage}}
+ {{#if site.mobileView}}
+ {{topic-footer-mobile-dropdown topic=topic
+ showInvite=showInvite
+ showFlagTopic=showFlagTopic}}
+ {{else}}
+ {{d-button class=bookmarkClass
+ title=bookmarkTitle
+ label=bookmarkLabel
+ icon="bookmark"
+ action=toggleBookmark}}
+
+
+
+ {{#if topic.details.can_flag_topic}}
+ {{d-button class="flag-topic"
+ title="topic.flag_topic.help"
+ label="topic.flag_topic.title"
+ icon="flag"
+ action=showFlagTopic}}
+ {{/if}}
+
+ {{/if}}
+{{/unless}}
+
+{{#if canInviteTo}}
+ {{d-button class="invite-topic"
+ title="topic.invite_reply.help"
+ label="topic.invite_reply.title"
+ icon="users"
+ action=showInvite
+ disabled=inviteDisabled}}
+{{/if}}
+
+{{#if topic.isPrivateMessage}}
+ {{d-button class="standard"
+ title=archiveTitle
+ label=archiveLabel
+ icon=archiveIcon
+ action=toggleArchiveMessage}}
+{{/if}}
+
+{{plugin-outlet name="topic-footer-main-buttons-before-create"
+ args=(hash topic=topic)
+ connectorTagName="span"}}
+
+{{#if topic.details.can_create_post}}
+ {{d-button class="btn-primary create"
+ icon="reply"
+ action=replyToPost
+ label="topic.reply.title"
+ title="topic.reply.help"}}
+{{/if}}
+
+{{plugin-outlet name="after-topic-footer-main-buttons"
+ args=(hash topic=topic)
+ connectorTagName="span"}}
+
+{{pinned-button topic=topic}}
+{{topic-notifications-button topic=topic}}
+{{plugin-outlet name="after-topic-footer-buttons"
+ args=(hash topic=topic)
+ connectorTagName="span"}}
diff --git a/app/assets/javascripts/discourse/templates/components/topic-list.hbs b/app/assets/javascripts/discourse/templates/components/topic-list.hbs
index ebc2e1bf5a6..e6c37234476 100644
--- a/app/assets/javascripts/discourse/templates/components/topic-list.hbs
+++ b/app/assets/javascripts/discourse/templates/components/topic-list.hbs
@@ -26,6 +26,8 @@
showOpLikes=showOpLikes
expandGloballyPinned=expandGloballyPinned
expandAllPinned=expandAllPinned
+ lastVisitedTopic=lastVisitedTopic
selected=selected}}
+ {{raw "list/visited-line" lastVisitedTopic=lastVisitedTopic topic=topic}}
{{/each}}
diff --git a/app/assets/javascripts/discourse/templates/components/topic-progress.hbs b/app/assets/javascripts/discourse/templates/components/topic-progress.hbs
index a840c135645..1e2dfce6ccb 100644
--- a/app/assets/javascripts/discourse/templates/components/topic-progress.hbs
+++ b/app/assets/javascripts/discourse/templates/components/topic-progress.hbs
@@ -1,33 +1,13 @@
-{{#unless hidden}}
- {{#if expanded}}
-
- {{/if}}
-
-{{/unless}}
+
diff --git a/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs b/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs
new file mode 100644
index 00000000000..a38acddd1d8
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs
@@ -0,0 +1,128 @@
+{{#if visible}}
+
+
+
+ {{bound-avatar avatar "huge"}}
+ {{#if user.primary_group_name}}
+ {{avatar-flair
+ flairURL=user.primary_group_flair_url
+ flairBgColor=user.primary_group_flair_bg_color
+ flairColor=user.primary_group_flair_color
+ groupName=user.primary_group_name}}
+ {{/if}}
+
+
+
+
+
+ {{if nameFirst user.name username}} {{user-status user currentUser=currentUser}}
+
+
+ {{#unless nameFirst}}
+ {{#if user.name}}
+ {{user.name}}
+ {{/if}}
+ {{else}}
+ {{username}}
+ {{/unless}}
+
+ {{#if user.title}}
+ {{user.title}}
+ {{/if}}
+
+ {{plugin-outlet name="user-card-post-names" args=(hash user=user) tagName='div'}}
+
+
+
+
+ {{#if user.can_send_private_message_to_user}}
+ - {{fa-icon "envelope"}}{{i18n 'user.private_message'}}
+ {{/if}}
+
+ {{#if showFilter}}
+ - {{fa-icon "filter"}}{{i18n 'topic.filter_to' username=username count=topicPostCount}}
+ {{/if}}
+
+ {{#if hasUserFilters}}
+ - {{fa-icon "times"}}{{i18n 'topic.filters.cancel'}}
+ {{/if}}
+
+ {{#if showDelete}}
+ - {{fa-icon "exclamation-triangle"}}{{i18n 'admin.user.delete'}}
+ {{/if}}
+
+
+ {{#if isSuspended}}
+
+ {{fa-icon "ban"}}
+ {{i18n 'user.suspended_notice' date=user.suspendedTillDate}}
+ {{i18n 'user.suspended_reason'}} {{user.suspend_reason}}
+
+ {{else}}
+ {{#if user.bio_cooked}}{{text-overflow class="overflow" text=user.bio_excerpt}}{{/if}}
+ {{/if}}
+
+ {{#if user.card_badge}}
+ {{#link-to 'badges.show' user.card_badge class="card-badge" title=user.card_badge.name}}
+ {{icon-or-image user.card_badge.image title=user.card_badge.name}}
+ {{/link-to}}
+ {{/if}}
+
+ {{#if hasLocationOrWebsite}}
+
+ {{#if user.location}}
+ {{fa-icon "map-marker"}} {{user.location}}
+ {{/if}}
+
+ {{#if user.website_name}}
+
+ {{fa-icon "globe"}}
+ {{#if linkWebsite}}
+ {{user.website_name}}
+ {{else}}
+ {{user.website_name}}
+ {{/if}}
+
+ {{/if}}
+
+ {{plugin-outlet name="user-card-location-and-website" args=(hash user=user)}}
+
+ {{/if}}
+
+ {{#if user}}
+
+ {{/if}}
+
+ {{#if publicUserFields}}
+
+ {{#each publicUserFields as |uf|}}
+ {{#if uf.value}}
+
+ {{uf.field.name}}:
+ {{uf.value}}
+
+ {{/if}}
+ {{/each}}
+
+ {{/if}}
+
+ {{#if showBadges}}
+
+ {{#each user.featured_user_badges as |ub|}}
+ {{user-badge badge=ub.badge user=user}}
+ {{/each}}
+ {{#if showMoreBadges}}
+ {{#link-to 'user.badges' user class="btn more-user-badges"}}
+ {{i18n 'badges.more_badges' count=moreBadgesCount}}
+ {{/link-to}}
+ {{/if}}
+
+ {{/if}}
+
+{{/if}}
diff --git a/app/assets/javascripts/discourse/templates/composer.hbs b/app/assets/javascripts/discourse/templates/composer.hbs
index 2551444d598..9e20fd73309 100644
--- a/app/assets/javascripts/discourse/templates/composer.hbs
+++ b/app/assets/javascripts/discourse/templates/composer.hbs
@@ -1,135 +1,145 @@
-{{#if visible}}
-
+{{#composer-body
+ composer=model
+ openIfDraft="openIfDraft"
+ typed="typed"
+ cancelled="cancelled"
+ save="save"}}
+ {{#if visible}}
+
- {{#if showPopupMenu}}
- {{#popup-menu visible=optionsVisible hide="hideOptions" title="composer.options"}}
- {{#each popupMenuOptions as |option|}}
- {{#if option.condition}}
-
- {{d-button action=option.action icon=option.icon label=option.label}}
-
+ {{#if showPopupMenu}}
+ {{#popup-menu visible=optionsVisible hide="hideOptions" title="composer.options"}}
+ {{#each popupMenuOptions as |option|}}
+ {{#if option.condition}}
+
+ {{d-button action=option.action icon=option.icon label=option.label}}
+
+ {{/if}}
+ {{/each}}
+ {{/popup-menu}}
+ {{/if}}
+
+ {{composer-messages composer=model messageCount=messageCount addLinkLookup="addLinkLookup"}}
+
+
+ {{#if site.mobileView}}
+
{{/if}}
- {{/each}}
- {{/popup-menu}}
- {{/if}}
+
- {{composer-messages composer=model messageCount=messageCount addLinkLookup="addLinkLookup"}}
+ {{#if model.viewOpen}}
+
+
+ {{plugin-outlet name="composer-open" args=(hash model=model)}}
-
- {{#if site.mobileView}}
-
- {{/if}}
-
-
- {{#if model.viewOpen}}
-
-
- {{plugin-outlet "composer-open"}}
-
-
-
- {{#if model.canEditTitle}}
-
- {{#if model.creatingPrivateMessage}}
- {{composer-user-selector topicId=topicModel.id
- usernames=model.targetUsernames
- hasGroups=model.hasTargetGroups
- focusTarget=focusTarget}}
- {{#if showWarning}}
-
-
-
+
+
+ {{#if model.canEditTitle}}
+
+ {{#if model.creatingPrivateMessage}}
+ {{composer-user-selector topicId=topicModel.id
+ usernames=model.targetUsernames
+ hasGroups=model.hasTargetGroups
+ focusTarget=focusTarget}}
+ {{#if showWarning}}
+
+
+
+ {{/if}}
+ {{/if}}
+
+ {{composer-title composer=model lastValidatedAt=lastValidatedAt focusTarget=focusTarget}}
+
+ {{#if model.showCategoryChooser}}
+
+ {{category-chooser valueAttribute="id" value=model.categoryId scopedCategoryId=scopedCategoryId tabindex="3"}}
+ {{popup-input-tip validation=categoryValidation}}
+
+ {{#if model.archetype.hasOptions}}
+
+ {{/if}}
+ {{/if}}
+
{{/if}}
+ {{plugin-outlet name="composer-fields" args=(hash model=model)}}
- {{/if}}
- {{plugin-outlet "composer-fields"}}
-
+ {{composer-editor topic=topic
+ composer=model
+ lastValidatedAt=lastValidatedAt
+ canWhisper=canWhisper
+ showPopupMenu=showPopupMenu
+ draftStatus=model.draftStatus
+ isUploading=isUploading
+ groupsMentioned="groupsMentioned"
+ cannotSeeMention="cannotSeeMention"
+ importQuote="importQuote"
+ showOptions="showOptions"
+ hideOptions="hideOptions"
+ optionsVisible=optionsVisible
+ showToolbar=showToolbar
+ showUploadSelector="showUploadSelector"
+ afterRefresh="afterRefresh"}}
- {{composer-editor topic=topic
- composer=model
- lastValidatedAt=lastValidatedAt
- canWhisper=canWhisper
- showPopupMenu=showPopupMenu
- draftStatus=model.draftStatus
- isUploading=isUploading
- groupsMentioned="groupsMentioned"
- importQuote="importQuote"
- showOptions="showOptions"
- hideOptions="hideOptions"
- optionsVisible=optionsVisible
- showToolbar=showToolbar
- showUploadSelector="showUploadSelector"
- afterRefresh="afterRefresh"}}
+ {{#if currentUser}}
+
+ {{plugin-outlet name="composer-fields-below" args=(hash model=model)}}
+ {{#if canEditTags}}
+ {{tag-chooser tags=model.tags tabIndex="4" categoryId=model.categoryId}}
+ {{/if}}
+
+ {{i18n 'cancel'}}
- {{#if currentUser}}
-
- {{plugin-outlet "composer-fields-below"}}
- {{#if canEditTags}}
- {{tag-chooser tags=model.tags tabIndex="4" categoryId=model.categoryId}}
- {{/if}}
-
- {{i18n 'cancel'}}
-
- {{#if site.mobileView}}
- {{#if whisperOrUnlistTopic}}
-
- {{/if}}
+ {{#if site.mobileView}}
+ {{#if whisperOrUnlistTopic}}
+
+ {{/if}}
+ {{/if}}
+
{{/if}}
+ {{else}}
+
+
+
+ {{#if model.createdPost}}
+ {{i18n 'composer.saved'}} {{i18n 'composer.view_new_post'}}
+ {{else}}
+ {{i18n 'composer.saving'}} {{loading-spinner size="small"}}
+ {{/if}}
+
+
+ {{#if model.topic}}
+ {{fa-icon "mail-forward"}} {{{draftTitle}}}
+ {{else}}
+ {{i18n "composer.saved_draft"}}
+ {{/if}}
+
+
+
{{/if}}
-
- {{else}}
-
-
-
- {{#if model.createdPost}}
- {{i18n 'composer.saved'}} {{i18n 'composer.view_new_post'}}
- {{else}}
- {{i18n 'composer.saving'}} {{loading-spinner size="small"}}
- {{/if}}
-
-
- {{i18n 'composer.saved_draft'}}
-
-
-
- {{/if}}
-
-
-{{/if}}
+
+
+ {{/if}}
+{{/composer-body}}
diff --git a/app/assets/javascripts/discourse/templates/composer/similar-topics.hbs b/app/assets/javascripts/discourse/templates/composer/similar-topics.hbs
index 0f9d3797e77..304352f5496 100644
--- a/app/assets/javascripts/discourse/templates/composer/similar-topics.hbs
+++ b/app/assets/javascripts/discourse/templates/composer/similar-topics.hbs
@@ -2,5 +2,5 @@
{{i18n 'composer.similar_topics'}}
- {{mount-widget widget="search-result-topic" args=(as-hash results=message.similarTopics)}}
+ {{mount-widget widget="search-result-topic" args=(hash results=message.similarTopics)}}
diff --git a/app/assets/javascripts/discourse/templates/discovery.hbs b/app/assets/javascripts/discourse/templates/discovery.hbs
index 069be994bad..8c7a0d6d3f6 100644
--- a/app/assets/javascripts/discourse/templates/discovery.hbs
+++ b/app/assets/javascripts/discourse/templates/discovery.hbs
@@ -21,11 +21,12 @@
- {{plugin-outlet "discovery-list-container-top"}}
+ {{plugin-outlet name="discovery-list-container-top"
+ args=(hash category=category)}}
{{outlet "list-container"}}
-{{plugin-outlet "discovery-below"}}
+{{plugin-outlet name="discovery-below"}}
diff --git a/app/assets/javascripts/discourse/templates/discovery/categories.hbs b/app/assets/javascripts/discourse/templates/discovery/categories.hbs
index c4fb4fa6777..ae53e4cc788 100644
--- a/app/assets/javascripts/discourse/templates/discovery/categories.hbs
+++ b/app/assets/javascripts/discourse/templates/discovery/categories.hbs
@@ -1,59 +1,6 @@
-{{#if model.categories}}
- {{#discovery-categories refresh="refresh"}}
-
-
-
- {{i18n 'categories.category'}}
- {{i18n 'categories.latest'}}
- {{i18n 'categories.topics'}}
-
-
-
- {{#each model.categories as |c|}}
-
-
-
- {{category-title-link category=c}}
- {{category-unread category=c}}
- {{#if c.logo_url}}
- {{category-logo-link category=c}}
- {{/if}}
-
-
- {{{c.description_excerpt}}}
-
-
-
- {{#if c.subcategories}}
-
- {{#each c.subcategories as |s|}}
- {{category-link s hideParent="true"}}
- {{category-unread category=s}}
- {{/each}}
-
- {{/if}}
-
-
- {{#each c.featuredTopics as |f|}}
- {{featured-topic topic=f latestTopicOnly=latestTopicOnly action="showTopicEntrance"}}
- {{/each}}
-
-
-
-
- {{#each c.topicCountStats as |s|}}
-
- {{s.value}}
- / {{s.unit}}
-
- {{/each}}
-
-
-
-
- {{/each}}
-
-
- {{/discovery-categories}}
-
-{{/if}}
+{{#discovery-categories refresh="refresh"}}
+ {{component categoryPageStyle
+ categories=model.categories
+ latestTopicOnly=latestTopicOnly
+ topics=model.topics}}
+{{/discovery-categories}}
diff --git a/app/assets/javascripts/discourse/templates/discovery/topics.hbs b/app/assets/javascripts/discourse/templates/discovery/topics.hbs
index 4415e404c87..8d0ab34d9e2 100644
--- a/app/assets/javascripts/discourse/templates/discovery/topics.hbs
+++ b/app/assets/javascripts/discourse/templates/discovery/topics.hbs
@@ -33,6 +33,8 @@
{{#if hasTopics}}
{{topic-list
+ highlightLastVisited=true
+ top=top
showTopicPostBadges=showTopicPostBadges
showPosters=true
currentUser=currentUser
@@ -46,6 +48,7 @@
selected=selected
expandGloballyPinned=expandGloballyPinned
expandAllPinned=expandAllPinned
+ category=category
topics=model.topics}}
{{/if}}
{{/discovery-topics-list}}
diff --git a/app/assets/javascripts/discourse/templates/full-page-search.hbs b/app/assets/javascripts/discourse/templates/full-page-search.hbs
index b869f0a7241..bfeab09cfe2 100644
--- a/app/assets/javascripts/discourse/templates/full-page-search.hbs
+++ b/app/assets/javascripts/discourse/templates/full-page-search.hbs
@@ -1,119 +1,134 @@
-
- {{search-text-field value=searchTerm class="full-page-search input-xxlarge search no-blur" action="search" hasAutofocus=hasAutofocus}}
- {{d-button action="search" icon="search" class="btn-primary" disabled=searchButtonDisabled}}
- {{#if currentUser}}
- {{#unless site.mobileView}}
- {{d-button id="create-topic" class="btn-default" action="createTopic" actionParam=searchTerm icon="plus" label="topic.create"}}
- {{/unless}}
- {{/if}}
- {{#if canBulkSelect}}
- {{#if model.posts}}
- {{d-button icon="list" class="bulk-select" title="topics.bulk.toggle" action="toggleBulkSelect"}}
- {{bulk-select-button selected=selected action="refresh"}}
- {{/if}}
- {{/if}}
-
+{{#d-section pageClass="search" class="search-container"}}
+
+ {{search-text-field value=searchTerm class="full-page-search input-xxlarge search no-blur" action="search" hasAutofocus=hasAutofocus}}
+ {{d-button action="search" icon="search" class="btn-primary" disabled=searching}}
-{{#if model.posts}}
- {{#if bulkSelectEnabled}}
-
- {{/if}}
-{{/if}}
+
+
-{{#if context}}
-
-
-
-{{/if}}
-
-{{#conditional-loading-spinner condition=loading}}
-
- {{#unless model.posts}}
-
- {{#if searchActive}}
- {{i18n "search.no_results"}}
+ {{#if expanded}}
+ {{search-advanced-options searchTerm=searchTerm isExpanded=expanded}}
{{/if}}
- {{i18n "search.search_help"}}
-
- {{/unless}}
+
- {{#if model.posts}}
-
-
-
- {{{i18n "search.result_count" count=resultCount term=noSortQ}}}
-
-
-
-
- {{i18n "search.sort_by"}}
-
- {{combo-box value=sortOrder content=sortOrders castInteger="true"}}
-
+ {{#if canCreateTopic}}
+ {{d-button id="create-topic" class="btn-default" action="createTopic" actionParam=searchTerm icon="plus" label="topic.create"}}
+ {{/if}}
+
+ {{#if canBulkSelect}}
+ {{d-button icon="list" class="bulk-select" title="topics.bulk.toggle" action="toggleBulkSelect"}}
+ {{bulk-select-button selected=selected action="search"}}
+ {{/if}}
- {{/if}}
- {{#each model.posts as |result|}}
-
-
-
-
-
- {{#if bulkSelectEnabled}}
- {{track-selected selectedList=selected selectedId=result.topic}}
- {{/if}}
-
-
- {{topic-status topic=result.topic disableActions=true}}{{#highlight-text highlight=q}}{{{unbound result.topic.fancyTitle}}}{{/highlight-text}}
-
-
-
- {{category-link result.topic.category}}
- {{#each result.topic.tags as |tag|}}
- {{discourse-tag tag}}
- {{/each}}
- {{plugin-outlet "full-page-search-category"}}
-
-
-
-
-
- {{format-age result.created_at}}
- {{#if result.blurb}}
- -
- {{/if}}
-
-
- {{#if result.blurb}}
- {{#highlight-text highlight=q}}
- {{{unbound result.blurb}}}
- {{/highlight-text}}
- {{/if}}
-
-
- {{#if showLikeCount}}
- {{#if result.like_count}}
-
- {{result.like_count}}
-
- {{/if}}
- {{/if}}
-
+ {{#if bulkSelectEnabled}}
+
- {{/each}}
-
- {{#if model.posts}}
-
- {{i18n "search.no_more_results"}}
- {{i18n "search.search_help"}}
-
{{/if}}
-{{/conditional-loading-spinner}}
+ {{#if invalidSearch}}
+
+ {{i18n "search.too_short"}}
+
+ {{/if}}
+
+ {{#if context}}
+
+
+
+ {{/if}}
+
+ {{#conditional-loading-spinner condition=loading}}
+
+ {{#unless hasResults}}
+
+ {{#if searchActive}}
+ {{i18n "search.no_results"}}
+ {{/if}}
+
+ {{/unless}}
+
+ {{#if hasResults}}
+
+
+
+ {{{i18n "search.result_count" count=resultCount term=noSortQ}}}
+
+
+
+
+ {{i18n "search.sort_by"}}
+
+ {{combo-box value=sortOrder content=sortOrders castInteger="true"}}
+
+
+ {{/if}}
+
+ {{#each model.posts as |result|}}
+
+
+
+
+
+ {{#if bulkSelectEnabled}}
+ {{track-selected selectedList=selected selectedId=result.topic}}
+ {{/if}}
+
+
+ {{topic-status topic=result.topic disableActions=true}}{{#highlight-text highlight=q}}{{{unbound result.topic.fancyTitle}}}{{/highlight-text}}
+
+
+
+ {{category-link result.topic.category}}
+ {{#each result.topic.tags as |tag|}}
+ {{discourse-tag tag}}
+ {{/each}}
+ {{plugin-outlet name="full-page-search-category" args=(hash result=result)}}
+
+
+
+
+
+ {{format-age result.created_at}}
+ {{#if result.blurb}}
+ -
+ {{/if}}
+
+
+ {{#if result.blurb}}
+ {{#highlight-text highlight=q}}
+ {{{unbound result.blurb}}}
+ {{/highlight-text}}
+ {{/if}}
+
+
+ {{#if showLikeCount}}
+ {{#if result.like_count}}
+
+ {{result.like_count}} {{fa-icon "heart"}}
+
+ {{/if}}
+ {{/if}}
+
+
+ {{/each}}
+
+ {{#if hasResults}}
+
+ {{i18n "search.no_more_results"}}
+
+ {{/if}}
+
+ {{/conditional-loading-spinner}}
+{{/d-section}}
diff --git a/app/assets/javascripts/discourse/templates/group-posts.hbs b/app/assets/javascripts/discourse/templates/group-activity-posts.hbs
similarity index 71%
rename from app/assets/javascripts/discourse/templates/group-posts.hbs
rename to app/assets/javascripts/discourse/templates/group-activity-posts.hbs
index f38104880f4..7dbeebb3007 100644
--- a/app/assets/javascripts/discourse/templates/group-posts.hbs
+++ b/app/assets/javascripts/discourse/templates/group-activity-posts.hbs
@@ -1 +1 @@
-{{group-post-stream posts=model emptyText=emptyText loadMore="loadMore"}}
+{{group-post-stream posts=model emptyText=emptyText loadMore="loadMore" loading=loading}}
diff --git a/app/assets/javascripts/discourse/templates/group-edit.hbs b/app/assets/javascripts/discourse/templates/group-edit.hbs
new file mode 100644
index 00000000000..03122d2abaa
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/group-edit.hbs
@@ -0,0 +1,46 @@
+
+
+
diff --git a/app/assets/javascripts/discourse/templates/group-index.hbs b/app/assets/javascripts/discourse/templates/group-index.hbs
index 41ad1fd9226..86a35b11122 100644
--- a/app/assets/javascripts/discourse/templates/group-index.hbs
+++ b/app/assets/javascripts/discourse/templates/group-index.hbs
@@ -1,45 +1,39 @@
-{{#if model}}
- {{#if isOwner}}
-
-
-
- {{/if}}
+{{group-membership-button model=model
+ createNewMessageViaParams='createNewMessageViaParams'
+ showLogin='showLogin'}}
+{{#if hasMembers}}
{{#load-more selector=".group-members tr" action="loadMore"}}
{{i18n "groups.empty.users"}}
+
+
+ {{i18n "groups.empty.members"}}
{{/if}}
diff --git a/app/assets/javascripts/discourse/templates/group-logs.hbs b/app/assets/javascripts/discourse/templates/group-logs.hbs
new file mode 100644
index 00000000000..154b78d678e
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/group-logs.hbs
@@ -0,0 +1,33 @@
+{{#if model.logs}}
+
+ {{group-logs-filter clearFilter="clearFilter" value=filters.action type="action"}}
+ {{group-logs-filter clearFilter="clearFilter" value=filters.acting_user type="acting_user"}}
+ {{group-logs-filter clearFilter="clearFilter" value=filters.target_user type="target_user"}}
+ {{group-logs-filter clearFilter="clearFilter" value=filters.subject type="subject"}}
+
+
+ {{#load-more selector=".group-logs .group-logs-row" action="loadMore"}}
+
+
+ {{i18n 'groups.logs.action'}}
+ {{i18n 'groups.logs.acting_user'}}
+ {{i18n 'groups.logs.target_user'}}
+ {{i18n 'groups.logs.subject'}}
+ {{i18n 'groups.logs.when'}}
+
+ {{/load-more}}
+
+ {{conditional-loading-spinner condition=loading}}
+{{else}}
+ {{i18n "groups.empty.logs"}}
+{{/if}}
diff --git a/app/assets/javascripts/discourse/templates/group.hbs b/app/assets/javascripts/discourse/templates/group.hbs
index 416b356f405..571c1813d6e 100644
--- a/app/assets/javascripts/discourse/templates/group.hbs
+++ b/app/assets/javascripts/discourse/templates/group.hbs
@@ -1,27 +1,47 @@
-
-
-
+
+
+
+ {{#if model.flair_url}}
+
+ {{avatar-flair
+ flairURL=model.flair_url
+ flairBgColor=model.flair_bg_color
+ flairColor=model.flair_color
+ groupName=model.name}}
+
+ {{/if}}
-
-
-
-
- {{model.name}}
+
+ {{groupName}}
+
+
+ {{#if model.full_name}}{{model.name}}{{/if}}
-
- {{outlet}}
-
-
+
+
+
+ {{#if model.bio_cooked}}
+
+
+
+ {{{model.bio_cooked}}}
+
+ {{/if}}
+
+
+ {{#mobile-nav class='group-nav' desktopClass="nav nav-pills" currentPath=application.currentPath}}
+ {{#each getTabs as |tab|}}
+
+ {{#link-to tab.location model title=tab.message}}
+ {{#if tab.icon}}{{fa-icon tab.icon}}{{/if}}
+ {{tab.message}}
+ {{#if tab.count}}({{tab.count}}){{/if}}
+ {{/link-to}}
+
+ {{/each}}
+ {{/mobile-nav}}
+
+
+ {{outlet}}
diff --git a/app/assets/javascripts/discourse/templates/group/activity.hbs b/app/assets/javascripts/discourse/templates/group/activity.hbs
new file mode 100644
index 00000000000..d03a14e84f1
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/group/activity.hbs
@@ -0,0 +1,27 @@
+
+ {{#mobile-nav class='group-activity-nav' desktopClass="pull-left nav nav-stacked" currentPath=application.currentPath}}
+
+ {{#link-to 'group.activity.posts'}}{{i18n 'groups.posts'}}{{/link-to}}
+
+
+
+ {{#link-to 'group.activity.topics'}}{{i18n 'groups.topics'}}{{/link-to}}
+
+
+
+ {{#link-to 'group.activity.mentions'}}{{i18n 'groups.mentions'}}{{/link-to}}
+
+
+ {{#if showGroupMessages}}
+
+ {{#link-to 'group.activity.messages'}}{{i18n 'groups.messages'}}{{/link-to}}
+
+ {{/if}}
+ {{/mobile-nav}}
+
+
+
+ {{outlet}}
+
+
+
diff --git a/app/assets/javascripts/discourse/templates/groups.hbs b/app/assets/javascripts/discourse/templates/groups.hbs
new file mode 100644
index 00000000000..2699777f5a6
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/groups.hbs
@@ -0,0 +1,69 @@
+{{#d-section pageClass="groups"}}
+ {{i18n "groups.index.title"}}
+ {{#if groups}}
+ {{#load-more selector=".groups-table .groups-table-row" action="loadMore"}}
+
+
+
+ {{i18n "groups.user_count"}}
+ {{i18n "groups.membership"}}
+
+
+
+ {{#each groups as |group|}}
+
+
+ {{#link-to "group.members" group.name}}
+ {{#if group.flair_url}}
+
+ {{avatar-flair
+ flairURL=group.flair_url
+ flairBgColor=group.flair_bg_color
+ flairColor=group.flair_color
+ groupName=group.name}}
+
+ {{/if}}
+
+
+ {{group.name}}
+
+ {{#if group.full_name}}
+ {{group.full_name}}
+ {{/if}}
+
+ {{#if group.title}}
+
+ {{group.title}}
+
+ {{/if}}
+
+ {{/link-to}}
+
+
+ {{group.user_count}}
+
+
+ {{#group-membership-button model=group
+ createNewMessageViaParams='createNewMessageViaParams'
+ showMembershipStatus=true
+ groupUserIds=groups.extras.group_user_ids
+ showLogin='showLogin'}}
+
+ {{d-button icon="ban"
+ label=(if group.automatic 'groups.automatic_group' 'groups.closed_group')
+ disabled=true}}
+ {{/group-membership-button}}
+
+
+ {{/each}}
+
+
+
+ {{/load-more}}
+
+ {{conditional-loading-spinner condition=groups.loadingMore}}
+ {{else}}
+ {{i18n "groups.index.empty"}}
+ {{/if}}
+{{/d-section}}
diff --git a/app/assets/javascripts/discourse/templates/hide-modal.hbs b/app/assets/javascripts/discourse/templates/hide-modal.hbs
new file mode 100644
index 00000000000..69c2e656d9f
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/hide-modal.hbs
@@ -0,0 +1 @@
+{{hide-modal-trigger}}
diff --git a/app/assets/javascripts/discourse/templates/list/activity-column.raw.hbs b/app/assets/javascripts/discourse/templates/list/activity-column.raw.hbs
index f6d485f55ef..56a994a5510 100644
--- a/app/assets/javascripts/discourse/templates/list/activity-column.raw.hbs
+++ b/app/assets/javascripts/discourse/templates/list/activity-column.raw.hbs
@@ -1 +1 @@
-<{{this.tagName}} class="{{class}} {{cold-age-class topic.createdAt startDate=topic.bumpedAt class=""}} activity" title="{{{topic.bumpedAtTitle}}}">{{format-date topic.bumpedAt format="tiny" noTitle="true"}}
+<{{tagName}} class="{{class}} {{cold-age-class topic.createdAt startDate=topic.bumpedAt class=""}} activity" title="{{{topic.bumpedAtTitle}}}">{{format-date topic.bumpedAt format="tiny" noTitle="true"}}
diff --git a/app/assets/javascripts/discourse/templates/list/posts-count-column.raw.hbs b/app/assets/javascripts/discourse/templates/list/posts-count-column.raw.hbs
index 052bb477737..599d695abf5 100644
--- a/app/assets/javascripts/discourse/templates/list/posts-count-column.raw.hbs
+++ b/app/assets/javascripts/discourse/templates/list/posts-count-column.raw.hbs
@@ -1,3 +1,3 @@
<{{view.tagName}} class='num posts-map posts {{view.likesHeat}}' title='{{view.title}}'>
- {{number topic.replyCount}}
+ {{number topic.replyCount noTitle="true"}}
diff --git a/app/assets/javascripts/discourse/templates/list/topic-list-item.raw.hbs b/app/assets/javascripts/discourse/templates/list/topic-list-item.raw.hbs
index bc21dfd6a7d..bd444a8e55c 100644
--- a/app/assets/javascripts/discourse/templates/list/topic-list-item.raw.hbs
+++ b/app/assets/javascripts/discourse/templates/list/topic-list-item.raw.hbs
@@ -7,7 +7,10 @@
{{raw "topic-status" topic=topic}}
{{topic-link topic}}
- {{plugin-outlet "topic-list-after-title"}}
+ {{#if topic.featured_link}}
+ {{topic-featured-link topic}}
+ {{/if}}
+ {{raw-plugin-outlet name="topic-list-after-title"}}
{{#if showTopicPostBadges}}
{{raw "topic-post-badges" unread=topic.unread newPosts=topic.displayNewPosts unseen=topic.unseen url=topic.lastUnreadUrl}}
{{/if}}
@@ -18,7 +21,7 @@
{{/each}}
{{/if}}
- {{plugin-outlet "topic-list-tags"}}
+ {{raw-plugin-outlet name="topic-list-tags"}}
{{#if expandPinned}}
{{raw "list/topic-excerpt" topic=topic}}
{{/if}}
diff --git a/app/assets/javascripts/discourse/templates/list/visited-line.raw.hbs b/app/assets/javascripts/discourse/templates/list/visited-line.raw.hbs
new file mode 100644
index 00000000000..16558146c5b
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/list/visited-line.raw.hbs
@@ -0,0 +1,9 @@
+{{#if view.isLastVisited}}
+
+
+
+ {{i18n 'topics.new_messages_marker'}}
+
+
+
+{{/if}}
diff --git a/app/assets/javascripts/discourse/templates/loading.hbs b/app/assets/javascripts/discourse/templates/loading.hbs
new file mode 100644
index 00000000000..7b998117e8e
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/loading.hbs
@@ -0,0 +1 @@
+{{loading-spinner}}
diff --git a/app/assets/javascripts/discourse/templates/mobile/components/mobile-nav.hbs b/app/assets/javascripts/discourse/templates/mobile/components/mobile-nav.hbs
index 6b46d500ee7..cdab47c07bb 100644
--- a/app/assets/javascripts/discourse/templates/mobile/components/mobile-nav.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/components/mobile-nav.hbs
@@ -1,4 +1,6 @@
-{{{selectedHtml}}}
+{{#if selectedHtml}}
+ {{{selectedHtml}}}
+{{/if}}
diff --git a/app/assets/javascripts/discourse/templates/mobile/discovery/categories.hbs b/app/assets/javascripts/discourse/templates/mobile/discovery/categories.hbs
index 34a6e99a27e..2c93702e92f 100644
--- a/app/assets/javascripts/discourse/templates/mobile/discovery/categories.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/discovery/categories.hbs
@@ -1,5 +1,5 @@
{{#each model.categories as |c|}}
-
+
@@ -33,9 +33,16 @@