diff --git a/app/assets/javascripts/discourse/views/embedded-post.js.es6 b/app/assets/javascripts/discourse/views/embedded-post.js.es6
index 4697e439060364..4bccf52199c5a4 100644
--- a/app/assets/javascripts/discourse/views/embedded-post.js.es6
+++ b/app/assets/javascripts/discourse/views/embedded-post.js.es6
@@ -1,13 +1,15 @@
+import ScreenTrack from 'discourse/lib/screen-track';
+
export default Discourse.GroupedView.extend({
templateName: 'embedded-post',
classNames: ['reply'],
_startTracking: function() {
const post = this.get('content');
- Discourse.ScreenTrack.current().track(this.get('elementId'), post.get('post_number'));
+ ScreenTrack.current().track(this.get('elementId'), post.get('post_number'));
}.on('didInsertElement'),
_stopTracking: function() {
- Discourse.ScreenTrack.current().stopTracking(this.get('elementId'));
+ ScreenTrack.current().stopTracking(this.get('elementId'));
}.on('willDestroyElement')
});
diff --git a/app/assets/javascripts/discourse/views/list/posts-count-column.js.es6 b/app/assets/javascripts/discourse/views/list/posts-count-column.js.es6
index 19bed7d0d2c793..d6026366733815 100644
--- a/app/assets/javascripts/discourse/views/list/posts-count-column.js.es6
+++ b/app/assets/javascripts/discourse/views/list/posts-count-column.js.es6
@@ -1,3 +1,5 @@
+import { fmt } from 'discourse/lib/computed';
+
export default Ember.Object.extend({
tagName: "td",
ratio: function() {
@@ -26,6 +28,6 @@ export default Ember.Object.extend({
return '';
}.property(),
- likesHeat: Discourse.computed.fmt('ratioText', 'heatmap-%@'),
+ likesHeat: fmt('ratioText', 'heatmap-%@'),
});
diff --git a/app/assets/javascripts/discourse/views/post.js.es6 b/app/assets/javascripts/discourse/views/post.js.es6
index 38fb86f0f49a36..1d83deaff0ed5a 100644
--- a/app/assets/javascripts/discourse/views/post.js.es6
+++ b/app/assets/javascripts/discourse/views/post.js.es6
@@ -1,3 +1,6 @@
+import ScreenTrack from 'discourse/lib/screen-track';
+import { number } from 'discourse/lib/formatter';
+
const DAY = 60 * 50 * 1000;
const PostView = Discourse.GroupedView.extend(Ember.Evented, {
@@ -178,7 +181,7 @@ const PostView = Discourse.GroupedView.extend(Ember.Evented, {
// don't display badge counts on category badge & oneboxes (unless when explicitely stated)
if ($link.hasClass("track-link") ||
$link.closest('.badge-category,.onebox-result,.onebox-body').length === 0) {
- $link.append("" + Discourse.Formatter.number(lc.clicks) + "");
+ $link.append("" + number(lc.clicks) + "");
}
}
});
@@ -263,7 +266,7 @@ const PostView = Discourse.GroupedView.extend(Ember.Evented, {
},
_destroyedPostView: function() {
- Discourse.ScreenTrack.current().stopTracking(this.get('elementId'));
+ ScreenTrack.current().stopTracking(this.get('elementId'));
}.on('willDestroyElement'),
_postViewInserted: function() {
@@ -272,7 +275,7 @@ const PostView = Discourse.GroupedView.extend(Ember.Evented, {
this._showLinkCounts();
- Discourse.ScreenTrack.current().track($post.prop('id'), postNumber);
+ ScreenTrack.current().track($post.prop('id'), postNumber);
this.trigger('postViewInserted', $post);
diff --git a/app/assets/javascripts/discourse/views/topic.js.es6 b/app/assets/javascripts/discourse/views/topic.js.es6
index 206133422f9ffa..f31911ae0f380c 100644
--- a/app/assets/javascripts/discourse/views/topic.js.es6
+++ b/app/assets/javascripts/discourse/views/topic.js.es6
@@ -3,8 +3,9 @@ import AddArchetypeClass from 'discourse/mixins/add-archetype-class';
import ClickTrack from 'discourse/lib/click-track';
import { listenForViewEvent } from 'discourse/lib/app-events';
import { categoryBadgeHTML } from 'discourse/helpers/category-link';
+import Scrolling from 'discourse/mixins/scrolling';
-const TopicView = Discourse.View.extend(AddCategoryClass, AddArchetypeClass, Discourse.Scrolling, {
+const TopicView = Discourse.View.extend(AddCategoryClass, AddArchetypeClass, Scrolling, {
templateName: 'topic',
topicBinding: 'controller.model',
diff --git a/app/assets/javascripts/discourse/views/user-card.js.es6 b/app/assets/javascripts/discourse/views/user-card.js.es6
index 08b42013a26a79..2aa1b47593f014 100644
--- a/app/assets/javascripts/discourse/views/user-card.js.es6
+++ b/app/assets/javascripts/discourse/views/user-card.js.es6
@@ -1,5 +1,5 @@
+import { setting } from 'discourse/lib/computed';
import CleansUp from 'discourse/mixins/cleans-up';
-
import afterTransition from 'discourse/lib/after-transition';
const clickOutsideEventName = "mousedown.outside-user-card",
@@ -9,7 +9,7 @@ const clickOutsideEventName = "mousedown.outside-user-card",
export default Discourse.View.extend(CleansUp, {
elementId: 'user-card',
classNameBindings: ['controller.visible:show', 'controller.showBadges', 'controller.hasCardBadgeImage'],
- allowBackgrounds: Discourse.computed.setting('allow_profile_backgrounds'),
+ allowBackgrounds: setting('allow_profile_backgrounds'),
addBackground: function() {
const url = this.get('controller.user.card_background');
diff --git a/app/assets/javascripts/main_include.js b/app/assets/javascripts/main_include.js
index 8338d7921f78f4..a961cddc291a02 100644
--- a/app/assets/javascripts/main_include.js
+++ b/app/assets/javascripts/main_include.js
@@ -8,10 +8,14 @@
//= require ./discourse/lib/load-script
//= require ./discourse/lib/notification-levels
//= require ./discourse/lib/app-events
+//= require ./discourse/lib/avatar-template
//= require ./discourse/helpers/i18n
//= require ./discourse/helpers/fa-icon
+//= require ./discourse/helpers/register-unbound
//= require ./discourse/lib/ember_compat_handlebars
//= require ./discourse/lib/computed
+//= require ./discourse/lib/formatter
+//= require ./discourse/lib/eyeline
//= require ./discourse/helpers/register-unbound
//= require ./discourse/mixins/scrolling
//= require_tree ./discourse/mixins
@@ -36,7 +40,7 @@
//= require ./discourse/models/post-stream
//= require ./discourse/models/topic-details
//= require ./discourse/models/topic
-//= require ./discourse/models/user_action
+//= require ./discourse/models/user-action
//= require ./discourse/models/composer
//= require ./discourse/controllers/controller
//= require ./discourse/controllers/discovery-sortable
@@ -58,6 +62,7 @@
//= require ./discourse/lib/link-mentions
//= require ./discourse/views/composer
//= require ./discourse/lib/show-modal
+//= require ./discourse/lib/screen-track
//= require ./discourse/routes/discourse
//= require ./discourse/routes/build-topic-route
//= require ./discourse/routes/restricted-user
diff --git a/test/javascripts/admin/controllers/admin-user-badges-test.js.es6 b/test/javascripts/admin/controllers/admin-user-badges-test.js.es6
index db4637ce79e6e2..8f1a61976fb868 100644
--- a/test/javascripts/admin/controllers/admin-user-badges-test.js.es6
+++ b/test/javascripts/admin/controllers/admin-user-badges-test.js.es6
@@ -1,4 +1,4 @@
-moduleFor('controller:admin-user-badges', 'Admin User Badges Controller', {
+moduleFor('controller:admin-user-badges', {
needs: ['controller:adminUser']
});
diff --git a/test/javascripts/ember/resolver-test.js.es6 b/test/javascripts/ember/resolver-test.js.es6
index 14ed97094929b2..948add12d8b2fc 100644
--- a/test/javascripts/ember/resolver-test.js.es6
+++ b/test/javascripts/ember/resolver-test.js.es6
@@ -15,7 +15,7 @@ function setTemplates(lookupTemplateStrings) {
});
}
-module("Resolver", {
+module("lib:resolver", {
setup: function() {
originalTemplates = Ember.TEMPLATES;
Ember.TEMPLATES = {};
diff --git a/test/javascripts/lib/avatar-template-test.js.es6 b/test/javascripts/lib/avatar-template-test.js.es6
index 6ad5cc860dfb49..c2f004c8da23f5 100644
--- a/test/javascripts/lib/avatar-template-test.js.es6
+++ b/test/javascripts/lib/avatar-template-test.js.es6
@@ -1,6 +1,6 @@
import avatarTemplate from 'discourse/lib/avatar-template';
-module('avatarTemplate');
+module('lib:avatar-template');
test("avatarTemplate", function(){
var oldCDN = Discourse.CDN;
diff --git a/test/javascripts/lib/category-badge-test.js.es6 b/test/javascripts/lib/category-badge-test.js.es6
index 9dbe2f3f75d9a3..84d2c9c9ae209e 100644
--- a/test/javascripts/lib/category-badge-test.js.es6
+++ b/test/javascripts/lib/category-badge-test.js.es6
@@ -1,4 +1,4 @@
-module("categoryBadgeHTML");
+module("lib:category-link");
import { categoryBadgeHTML } from "discourse/helpers/category-link";
diff --git a/test/javascripts/lib/click-track-test.js.es6 b/test/javascripts/lib/click-track-test.js.es6
index f79b87cdaa5834..337a594339d002 100644
--- a/test/javascripts/lib/click-track-test.js.es6
+++ b/test/javascripts/lib/click-track-test.js.es6
@@ -4,7 +4,7 @@ var windowOpen,
win,
redirectTo;
-module("ClickTrack", {
+module("lib:click-track", {
setup: function() {
// Prevent any of these tests from navigating away
diff --git a/test/javascripts/lib/computed-test.js.es6 b/test/javascripts/lib/computed-test.js.es6
index cf4862f09cb047..4a228d33b394f2 100644
--- a/test/javascripts/lib/computed-test.js.es6
+++ b/test/javascripts/lib/computed-test.js.es6
@@ -1,4 +1,6 @@
-module("Discourse.Computed", {
+import { setting, propertyEqual, propertyNotEqual, fmt, i18n, url } from 'discourse/lib/computed';
+
+module("lib:computed", {
setup: function() {
sandbox.stub(I18n, "t", function(scope) {
return "%@ translated: " + scope;
@@ -12,8 +14,8 @@ module("Discourse.Computed", {
test("setting", function() {
var t = Em.Object.extend({
- vehicle: Discourse.computed.setting('vehicle'),
- missingProp: Discourse.computed.setting('madeUpThing')
+ vehicle: setting('vehicle'),
+ missingProp: setting('madeUpThing')
}).create();
Discourse.SiteSettings.vehicle = "airplane";
@@ -23,7 +25,7 @@ test("setting", function() {
test("propertyEqual", function() {
var t = Em.Object.extend({
- same: Discourse.computed.propertyEqual('cookies', 'biscuits')
+ same: propertyEqual('cookies', 'biscuits')
}).create({
cookies: 10,
biscuits: 10
@@ -36,7 +38,7 @@ test("propertyEqual", function() {
test("propertyNotEqual", function() {
var t = Em.Object.extend({
- diff: Discourse.computed.propertyNotEqual('cookies', 'biscuits')
+ diff: propertyNotEqual('cookies', 'biscuits')
}).create({
cookies: 10,
biscuits: 10
@@ -50,8 +52,8 @@ test("propertyNotEqual", function() {
test("fmt", function() {
var t = Em.Object.extend({
- exclaimyUsername: Discourse.computed.fmt('username', "!!! %@ !!!"),
- multiple: Discourse.computed.fmt('username', 'mood', "%@ is %@")
+ exclaimyUsername: fmt('username', "!!! %@ !!!"),
+ multiple: fmt('username', 'mood', "%@ is %@")
}).create({
username: 'eviltrout',
mood: "happy"
@@ -69,8 +71,8 @@ test("fmt", function() {
test("i18n", function() {
var t = Em.Object.extend({
- exclaimyUsername: Discourse.computed.i18n('username', "!!! %@ !!!"),
- multiple: Discourse.computed.i18n('username', 'mood', "%@ is %@")
+ exclaimyUsername: i18n('username', "!!! %@ !!!"),
+ multiple: i18n('username', 'mood', "%@ is %@")
}).create({
username: 'eviltrout',
mood: "happy"
@@ -90,7 +92,7 @@ test("url", function() {
var t, testClass;
testClass = Em.Object.extend({
- userUrl: Discourse.computed.url('username', "/users/%@")
+ userUrl: url('username', "/users/%@")
});
t = testClass.create({ username: 'eviltrout' });
diff --git a/test/javascripts/lib/formatter-test.js.es6 b/test/javascripts/lib/formatter-test.js.es6
index 20a966f61612e7..1774a8c295b9c1 100644
--- a/test/javascripts/lib/formatter-test.js.es6
+++ b/test/javascripts/lib/formatter-test.js.es6
@@ -1,6 +1,8 @@
var clock;
-module("Discourse.Formatter", {
+import { relativeAge, autoUpdatingRelativeAge, updateRelativeAge, breakUp, number } from 'discourse/lib/formatter';
+
+module("lib:formatter", {
setup: function() {
clock = sinon.useFakeTimers(new Date(2012,11,31,12,0).getTime());
},
@@ -17,7 +19,7 @@ var mins_ago = function(mins){
};
var formatMins = function(mins) {
- return Discourse.Formatter.relativeAge(mins_ago(mins), {format: format, leaveAgo: leaveAgo});
+ return relativeAge(mins_ago(mins), {format: format, leaveAgo: leaveAgo});
};
var formatHours = function(hours) {
@@ -141,26 +143,24 @@ test("formating tiny dates", function() {
Discourse.SiteSettings.relative_date_duration = originalValue;
});
-module("Discourse.Formatter");
-
test("autoUpdatingRelativeAge", function() {
var d = moment().subtract(1, 'day').toDate();
- var $elem = $(Discourse.Formatter.autoUpdatingRelativeAge(d));
+ var $elem = $(autoUpdatingRelativeAge(d));
equal($elem.data('format'), "tiny");
equal($elem.data('time'), d.getTime());
equal($elem.attr('title'), undefined);
- $elem = $(Discourse.Formatter.autoUpdatingRelativeAge(d, {title: true}));
+ $elem = $(autoUpdatingRelativeAge(d, {title: true}));
equal($elem.attr('title'), moment(d).longDate());
- $elem = $(Discourse.Formatter.autoUpdatingRelativeAge(d,{format: 'medium', title: true, leaveAgo: true}));
+ $elem = $(autoUpdatingRelativeAge(d,{format: 'medium', title: true, leaveAgo: true}));
equal($elem.data('format'), "medium-with-ago");
equal($elem.data('time'), d.getTime());
equal($elem.attr('title'), moment(d).longDate());
equal($elem.html(), '1 day ago');
- $elem = $(Discourse.Formatter.autoUpdatingRelativeAge(d,{format: 'medium'}));
+ $elem = $(autoUpdatingRelativeAge(d,{format: 'medium'}));
equal($elem.data('format'), "medium");
equal($elem.data('time'), d.getTime());
equal($elem.attr('title'), undefined);
@@ -170,25 +170,25 @@ test("autoUpdatingRelativeAge", function() {
test("updateRelativeAge", function(){
var d = new Date();
- var $elem = $(Discourse.Formatter.autoUpdatingRelativeAge(d));
+ var $elem = $(autoUpdatingRelativeAge(d));
$elem.data('time', d.getTime() - 2 * 60 * 1000);
- Discourse.Formatter.updateRelativeAge($elem);
+ updateRelativeAge($elem);
equal($elem.html(), "2m");
d = new Date();
- $elem = $(Discourse.Formatter.autoUpdatingRelativeAge(d, {format: 'medium', leaveAgo: true}));
+ $elem = $(autoUpdatingRelativeAge(d, {format: 'medium', leaveAgo: true}));
$elem.data('time', d.getTime() - 2 * 60 * 1000);
- Discourse.Formatter.updateRelativeAge($elem);
+ updateRelativeAge($elem);
equal($elem.html(), "2 mins ago");
});
test("breakUp", function(){
- var b = function(s,hint){ return Discourse.Formatter.breakUp(s,hint); };
+ var b = function(s,hint){ return breakUp(s,hint); };
equal(b("hello"), "hello");
equal(b("helloworld"), "helloworld");
@@ -201,9 +201,9 @@ test("breakUp", function(){
});
test("number", function() {
- equal(Discourse.Formatter.number(123), "123", "it returns a string version of the number");
- equal(Discourse.Formatter.number("123"), "123", "it works with a string command");
- equal(Discourse.Formatter.number(NaN), "0", "it returns 0 for NaN");
- equal(Discourse.Formatter.number(3333), "3.3k", "it abbreviates thousands");
- equal(Discourse.Formatter.number(2499999), "2.5M", "it abbreviates millions");
+ equal(number(123), "123", "it returns a string version of the number");
+ equal(number("123"), "123", "it works with a string command");
+ equal(number(NaN), "0", "it returns 0 for NaN");
+ equal(number(3333), "3.3k", "it abbreviates thousands");
+ equal(number(2499999), "2.5M", "it abbreviates millions");
});
diff --git a/test/javascripts/mixins/selected-posts-count-test.js.es6 b/test/javascripts/mixins/selected-posts-count-test.js.es6
index 9533acdce5a1f7..b07122fc5fa254 100644
--- a/test/javascripts/mixins/selected-posts-count-test.js.es6
+++ b/test/javascripts/mixins/selected-posts-count-test.js.es6
@@ -1,4 +1,4 @@
-module("SelectedPostsCount");
+module("mixin:selected-posts-count");
import SelectedPostsCount from 'discourse/mixins/selected-posts-count';
import Topic from 'discourse/models/topic';
diff --git a/test/javascripts/mixins/singleton-test.js.es6 b/test/javascripts/mixins/singleton-test.js.es6
index dba0f5ab728d38..80f0846dac4d49 100644
--- a/test/javascripts/mixins/singleton-test.js.es6
+++ b/test/javascripts/mixins/singleton-test.js.es6
@@ -1,8 +1,10 @@
-module("Discourse.Singleton");
+import Singleton from 'discourse/mixins/singleton';
+
+module("mixin:singleton");
test("current", function() {
var DummyModel = Ember.Object.extend({});
- DummyModel.reopenClass(Discourse.Singleton);
+ DummyModel.reopenClass(Singleton);
var current = DummyModel.current();
present(current, 'current returns the current instance');
@@ -12,7 +14,7 @@ test("current", function() {
test("currentProp reading", function() {
var DummyModel = Ember.Object.extend({});
- DummyModel.reopenClass(Discourse.Singleton);
+ DummyModel.reopenClass(Singleton);
var current = DummyModel.current();
blank(DummyModel.currentProp('evil'), 'by default attributes are blank');
@@ -22,7 +24,7 @@ test("currentProp reading", function() {
test("currentProp writing", function() {
var DummyModel = Ember.Object.extend({});
- DummyModel.reopenClass(Discourse.Singleton);
+ DummyModel.reopenClass(Singleton);
blank(DummyModel.currentProp('adventure'), 'by default attributes are blank');
var result = DummyModel.currentProp('adventure', 'time');
@@ -38,7 +40,7 @@ test("currentProp writing", function() {
test("createCurrent", function() {
var Shoe = Ember.Object.extend({});
- Shoe.reopenClass(Discourse.Singleton, {
+ Shoe.reopenClass(Singleton, {
createCurrent: function() {
return Shoe.create({toes: 5});
}
@@ -50,7 +52,7 @@ test("createCurrent", function() {
test("createCurrent that returns null", function() {
var Missing = Ember.Object.extend({});
- Missing.reopenClass(Discourse.Singleton, {
+ Missing.reopenClass(Singleton, {
createCurrent: function() {
return null;
}
diff --git a/test/javascripts/models/session-test.js.es6 b/test/javascripts/models/session-test.js.es6
index d4d3ff5a552e2b..320b5fb3665f60 100644
--- a/test/javascripts/models/session-test.js.es6
+++ b/test/javascripts/models/session-test.js.es6
@@ -1,8 +1,8 @@
import Session from "discourse/models/session";
-module("Discourse.Session");
+module("model:session");
test('highestSeenByTopic', function() {
- var session = Session.current();
+ const session = Session.current();
deepEqual(session.get('highestSeenByTopic'), {}, "by default it returns an empty object");
});
diff --git a/test/javascripts/test_helper.js b/test/javascripts/test_helper.js
index f93e3879814971..48cbf025e319c9 100644
--- a/test/javascripts/test_helper.js
+++ b/test/javascripts/test_helper.js
@@ -79,6 +79,7 @@ var origDebounce = Ember.run.debounce,
createPretendServer = require('helpers/create-pretender', null, null, false).default,
fixtures = require('fixtures/site_fixtures', null, null, false).default,
flushMap = require('discourse/models/store', null, null, false).flushMap,
+ ScrollingDOMMethods = require('discourse/mixins/scrolling', null, null, false).ScrollingDOMMethods,
server;
function dup(obj) {
@@ -92,6 +93,7 @@ QUnit.testStart(function(ctx) {
Discourse.SiteSettings = dup(Discourse.SiteSettingsOriginal);
Discourse.BaseUri = "/";
Discourse.BaseUrl = "localhost";
+ Discourse.Session.resetCurrent();
Discourse.User.resetCurrent();
Discourse.Site.resetCurrent(Discourse.Site.create(dup(fixtures['site.json'].site)));
@@ -103,8 +105,8 @@ QUnit.testStart(function(ctx) {
PreloadStore.reset();
window.sandbox = sinon.sandbox.create();
- window.sandbox.stub(Discourse.ScrollingDOMMethods, "bindOnScroll");
- window.sandbox.stub(Discourse.ScrollingDOMMethods, "unbindOnScroll");
+ window.sandbox.stub(ScrollingDOMMethods, "bindOnScroll");
+ window.sandbox.stub(ScrollingDOMMethods, "unbindOnScroll");
// Don't debounce in test unless we're testing debouncing
if (ctx.module.indexOf('debounce') === -1) {