diff --git a/src/aria/templates/Modifiers.js b/src/aria/templates/Modifiers.js
index 61ba89180..cc96c3963 100644
--- a/src/aria/templates/Modifiers.js
+++ b/src/aria/templates/Modifiers.js
@@ -38,27 +38,6 @@ var ariaUtilsArray = require("../utils/Array");
return "";
}
},
- /* BACKWARD-COMPATIBILITY-BEGIN (deprecate escape modifier) */
- "escape" : {
- /**
- * Initialization function called when the template is parsed
- * @param {aria.templates.ClassWriter} out
- */
- init : function (out) {
- out.addDependencies(["aria.utils.String"]);
- },
- /**
- * MODIFIER
Escape < > & in the given entry.
- * @name aria.templates.Modifiers.prototype.escape
- * @param {String} str the entry
- * @return {String}
- */
- fn : function (s) {
- this.$logWarn(aria.templates.Modifiers.DEPRECATED_ESCAPE_MODIFIER);
- return ariaUtilsString.escapeHTML(String(s));
- }
- },
- /* BACKWARD-COMPATIBILITY-END (deprecate escape modifier) */
"escapeforhtml" : {
/**
* Initialization function called when the template is parsed
@@ -385,9 +364,6 @@ var ariaUtilsArray = require("../utils/Array");
},
$statics : {
UNKNOWN_MODIFIER : "Unknown modifier %1.",
- /* BACKWARD-COMPATIBILITY-BEGIN (deprecate escape modifier) */
- DEPRECATED_ESCAPE_MODIFIER : "Escape modifier is deprecated, please use escapeforhtml modifier instead",
- /* BACKWARD-COMPATIBILITY-END (deprecate escape modifier) */
DATEFORMAT_MODIFIER_ENTRY : "Entry %1 is not a date."
},
$prototype : {
diff --git a/test/aria/templates/TemplatesTestSuite.js b/test/aria/templates/TemplatesTestSuite.js
index 7fbf03743..b4fd4db72 100644
--- a/test/aria/templates/TemplatesTestSuite.js
+++ b/test/aria/templates/TemplatesTestSuite.js
@@ -105,9 +105,6 @@ Aria.classDefinition({
this.addTests("test.aria.templates.reloadParentTemplate.ParentReloadTestSuite");
this.addTests("test.aria.templates.layoutResize.ResizeTestCase");
- /* BACKWARD-COMPATIBILITY-BEGIN (deprecate escape modifier) */
- this.addTests("test.aria.templates.escapemodifier.EscapeModifierLogTest");
- /* BACKWARD-COMPATIBILITY-END (deprecate escape modifier) */
}
});
diff --git a/test/aria/templates/escapemodifier/EscapeModifierLogTest.js b/test/aria/templates/escapemodifier/EscapeModifierLogTest.js
deleted file mode 100644
index b002f12c6..000000000
--- a/test/aria/templates/escapemodifier/EscapeModifierLogTest.js
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2012 Amadeus s.a.s.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/* BACKWARD-COMPATIBILITY-BEGIN (deprecate escape modifier) */
-Aria.classDefinition({
- $classpath : "test.aria.templates.escapemodifier.EscapeModifierLogTest",
- $extends : "aria.jsunit.TestCase",
- $dependencies : ["aria.templates.Modifiers", "aria.utils.String"],
- $prototype : {
- /**
- * Call escape modifier and check for the log
- */
- testLogWarnRaisedForEscape : function () {
- var escapedValue = aria.templates.Modifiers.callModifier("escape", [""]);
- this.assertEquals(escapedValue, "<escape string>", "String is not escaped properly");
- this.assertErrorInLogs(aria.templates.Modifiers.DEPRECATED_ESCAPE_MODIFIER, 1);
- }
- }
-});
-/* BACKWARD-COMPATIBILITY-END (deprecate escape modifier) */
\ No newline at end of file