Skip to content

Commit

Permalink
Handle translations like template options
Browse files Browse the repository at this point in the history
Translations will now be passed through `escapeMarkup` and injected
into the results messages as HTML just like the templating options
for the the results and selections.  This fixes the regression from
3.x where the old formatters always supported HTML.

This closes #3008.
  • Loading branch information
kevin-brown committed Feb 7, 2015
1 parent 78b6faf commit 1766e31
Show file tree
Hide file tree
Showing 7 changed files with 37 additions and 7 deletions.
8 changes: 7 additions & 1 deletion dist/js/select2.amd.full.js
Expand Up @@ -272,6 +272,8 @@ define('select2/results',[
};

Results.prototype.displayMessage = function (params) {
var escapeMarkup = this.options.get('escapeMarkup');

this.clear();
this.hideLoading();

Expand All @@ -281,7 +283,11 @@ define('select2/results',[

var message = this.options.get('translations').get(params.message);

$message.text(message(params.args));
$message.append(
escapeMarkup(
message(params.args)
)
);

this.$results.append($message);
};
Expand Down
8 changes: 7 additions & 1 deletion dist/js/select2.amd.js
Expand Up @@ -272,6 +272,8 @@ define('select2/results',[
};

Results.prototype.displayMessage = function (params) {
var escapeMarkup = this.options.get('escapeMarkup');

this.clear();
this.hideLoading();

Expand All @@ -281,7 +283,11 @@ define('select2/results',[

var message = this.options.get('translations').get(params.message);

$message.text(message(params.args));
$message.append(
escapeMarkup(
message(params.args)
)
);

this.$results.append($message);
};
Expand Down
8 changes: 7 additions & 1 deletion dist/js/select2.full.js
Expand Up @@ -710,6 +710,8 @@ define('select2/results',[
};

Results.prototype.displayMessage = function (params) {
var escapeMarkup = this.options.get('escapeMarkup');

this.clear();
this.hideLoading();

Expand All @@ -719,7 +721,11 @@ define('select2/results',[

var message = this.options.get('translations').get(params.message);

$message.text(message(params.args));
$message.append(
escapeMarkup(
message(params.args)
)
);

this.$results.append($message);
};
Expand Down
2 changes: 1 addition & 1 deletion dist/js/select2.full.min.js

Large diffs are not rendered by default.

8 changes: 7 additions & 1 deletion dist/js/select2.js
Expand Up @@ -710,6 +710,8 @@ define('select2/results',[
};

Results.prototype.displayMessage = function (params) {
var escapeMarkup = this.options.get('escapeMarkup');

this.clear();
this.hideLoading();

Expand All @@ -719,7 +721,11 @@ define('select2/results',[

var message = this.options.get('translations').get(params.message);

$message.text(message(params.args));
$message.append(
escapeMarkup(
message(params.args)
)
);

this.$results.append($message);
};
Expand Down
2 changes: 1 addition & 1 deletion dist/js/select2.min.js

Large diffs are not rendered by default.

8 changes: 7 additions & 1 deletion src/js/select2/results.js
Expand Up @@ -31,6 +31,8 @@ define([
};

Results.prototype.displayMessage = function (params) {
var escapeMarkup = this.options.get('escapeMarkup');

this.clear();
this.hideLoading();

Expand All @@ -40,7 +42,11 @@ define([

var message = this.options.get('translations').get(params.message);

$message.text(message(params.args));
$message.append(
escapeMarkup(
message(params.args)
)
);

this.$results.append($message);
};
Expand Down

0 comments on commit 1766e31

Please sign in to comment.