From 22adb682d8675508ec410c382a226ade1338d00d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Hanol?= <regis@hanol.fr>
Date: Thu, 29 Jan 2015 20:42:05 +0100
Subject: [PATCH] revert - FIX: use CDN for user card/profile background and
user avatars
---
app/assets/javascripts/discourse.js | 6 ------
.../discourse/dialects/quote_dialect.js | 1 -
app/assets/javascripts/discourse/lib/utilities.js | 2 +-
app/assets/javascripts/discourse/models/user.js | 14 +++++++++-----
.../javascripts/discourse/views/user-card.js.es6 | 3 +--
lib/pretty_text.rb | 4 +---
6 files changed, 12 insertions(+), 18 deletions(-)
diff --git a/app/assets/javascripts/discourse.js b/app/assets/javascripts/discourse.js
index feb375d90..27b12c53a 100644
--- a/app/assets/javascripts/discourse.js
+++ b/app/assets/javascripts/discourse.js
@@ -24,12 +24,6 @@ window.Discourse = Ember.Application.createWithMixins(Discourse.Ajax, {
return u + url;
},
- getURLWithCDN: function(url) {
- url = this.getURL(url);
- if (Discourse.CDN) { url = Discourse.CDN + url; }
- return url;
- },
-
Resolver: DiscourseResolver,
_titleChanged: function() {
diff --git a/app/assets/javascripts/discourse/dialects/quote_dialect.js b/app/assets/javascripts/discourse/dialects/quote_dialect.js
index 3c50598cf..b0b8f5bbb 100644
--- a/app/assets/javascripts/discourse/dialects/quote_dialect.js
+++ b/app/assets/javascripts/discourse/dialects/quote_dialect.js
@@ -1,5 +1,4 @@
var esc = Handlebars.Utils.escapeExpression;
-
Discourse.BBCode.register('quote', {noWrap: true, singlePara: true}, function(contents, bbParams, options) {
var params = {'class': 'quote'},
username = null;
diff --git a/app/assets/javascripts/discourse/lib/utilities.js b/app/assets/javascripts/discourse/lib/utilities.js
index 4d32b9c94..243910e01 100644
--- a/app/assets/javascripts/discourse/lib/utilities.js
+++ b/app/assets/javascripts/discourse/lib/utilities.js
@@ -51,7 +51,7 @@ Discourse.Utilities = {
var classes = "avatar" + (options.extraClasses ? " " + options.extraClasses : "");
var title = (options.title) ? " title='" + Handlebars.Utils.escapeExpression(options.title || "") + "'" : "";
- return "<img width='" + size + "' height='" + size + "' src='" + Discourse.getURLWithCDN(url) + "' class='" + classes + "'" + title + ">";
+ return "<img width='" + size + "' height='" + size + "' src='" + url + "' class='" + classes + "'" + title + ">";
},
tinyAvatar: function(avatarTemplate, options) {
diff --git a/app/assets/javascripts/discourse/models/user.js b/app/assets/javascripts/discourse/models/user.js
index fde769225..7a5bd5c37 100644
--- a/app/assets/javascripts/discourse/models/user.js
+++ b/app/assets/javascripts/discourse/models/user.js
@@ -72,9 +72,10 @@ Discourse.User = Discourse.Model.extend({
@type {String}
**/
profileBackground: function() {
- var url = this.get('profile_background');
- if (Em.isEmpty(url) || !Discourse.SiteSettings.allow_profile_backgrounds) { return; }
- return 'background-image: url(' + Discourse.getURLWithCDN(url) + ')';
+ var background = this.get('profile_background');
+ if(Em.isEmpty(background) || !Discourse.SiteSettings.allow_profile_backgrounds) { return; }
+
+ return 'background-image: url(' + background + ')';
}.property('profile_background'),
/**
@@ -441,7 +442,6 @@ Discourse.User.reopenClass(Discourse.Singleton, {
avatarTemplate: function(username, uploadedAvatarId) {
var url;
-
if (uploadedAvatarId) {
url = "/user_avatar/" +
Discourse.BaseUrl +
@@ -456,7 +456,11 @@ Discourse.User.reopenClass(Discourse.Singleton, {
Discourse.LetterAvatarVersion + ".png";
}
- return Discourse.getURLWithCDN(url);
+ url = Discourse.getURL(url);
+ if (Discourse.CDN) {
+ url = Discourse.CDN + url;
+ }
+ return url;
},
/**
diff --git a/app/assets/javascripts/discourse/views/user-card.js.es6 b/app/assets/javascripts/discourse/views/user-card.js.es6
index 66e62b88d..123942029 100644
--- a/app/assets/javascripts/discourse/views/user-card.js.es6
+++ b/app/assets/javascripts/discourse/views/user-card.js.es6
@@ -11,7 +11,6 @@ export default Discourse.View.extend(CleansUp, {
addBackground: function() {
var url = this.get('controller.user.card_background');
-
if (!this.get('allowBackgrounds')) { return; }
var $this = this.$();
@@ -20,7 +19,7 @@ export default Discourse.View.extend(CleansUp, {
if (Ember.isEmpty(url)) {
$this.css('background-image', '').addClass('no-bg');
} else {
- $this.css('background-image', "url(" + Discourse.getURLWithCDN(url) + ")").removeClass('no-bg');
+ $this.css('background-image', "url(" + url + ")").removeClass('no-bg');
}
}.observes('controller.user.card_background'),
diff --git a/lib/pretty_text.rb b/lib/pretty_text.rb
index 98390edd6..ee5aa5783 100644
--- a/lib/pretty_text.rb
+++ b/lib/pretty_text.rb
@@ -128,9 +128,7 @@ module PrettyText
context.eval("Discourse.SiteSettings = #{SiteSetting.client_settings_json};")
context.eval("Discourse.CDN = '#{Rails.configuration.action_controller.asset_host}';")
context.eval("Discourse.BaseUrl = 'http://#{RailsMultisite::ConnectionManagement.current_hostname}';")
-
- context.eval("Discourse.getURL = function(url) { return '#{Discourse::base_uri}' + url };")
- context.eval("Discourse.getURLWithCDN = function(url) { url = Discourse.getURL(url); if (Discourse.CDN) { url = Discourse.CDN + url; } return url; };")
+ context.eval("Discourse.getURL = function(url) {return '#{Discourse::base_uri}' + url};")
end
def self.markdown(text, opts=nil)