Comparing version 1.15.0 to 1.15.1
@@ -110,2 +110,11 @@ define([ | ||
// Filter the html content when it is set and retrieved in the editor. | ||
this.removeValueFilterHandles(); | ||
this._setValueFilterHandle = aspect.before(this.editor, "setValue", lang.hitch(this, function (html) { | ||
return [this._filter(html)]; | ||
})); | ||
this._getValueFilterHandle = aspect.after(this.editor, "getValue", lang.hitch(this, function (html) { | ||
return this._filter(html); | ||
})); | ||
this.editor.addKeyHandler(keys.F12, true, true, lang.hitch(this, function(e){ | ||
@@ -156,5 +165,2 @@ // Move the focus before switching | ||
this.editor.onDisplayChanged(); | ||
html = ed.get("value"); | ||
html = this._filter(html); | ||
ed.set("value", html); | ||
array.forEach(edPlugins, function(p){ | ||
@@ -175,3 +181,3 @@ // Turn off any plugins not controlled by queryCommandenabled. | ||
this.sourceArea.value = html; | ||
this.sourceArea.value = ed.get("value"); | ||
@@ -241,3 +247,3 @@ // Since neither iframe nor textarea have margin, border, or padding, | ||
htmlTxt = htmlTxt || ""; | ||
htmlTxt = this._filter(htmlTxt); | ||
// htmlTxt was filtered in setValue before aspect. | ||
this.sourceArea.value = htmlTxt; | ||
@@ -269,4 +275,4 @@ }), true); | ||
html = this.sourceArea.value; | ||
html = this._filter(html); | ||
ed.beginEditing(); | ||
// html will be filtered in setValue aspect. | ||
ed.set("value", html); | ||
@@ -531,2 +537,13 @@ ed.endEditing(); | ||
removeValueFilterHandles: function () { | ||
if (this._setValueFilterHandle) { | ||
this._setValueFilterHandle.remove(); | ||
delete this._setValueFilterHandle; | ||
} | ||
if (this._getValueFilterHandle) { | ||
this._getValueFilterHandle.remove(); | ||
delete this._getValueFilterHandle; | ||
} | ||
}, | ||
setSourceAreaCaret: function(){ | ||
@@ -566,2 +583,3 @@ // summary: | ||
} | ||
this.removeValueFilterHandles(); | ||
this.inherited(arguments); | ||
@@ -568,0 +586,0 @@ } |
@@ -18,3 +18,3 @@ { | ||
"dependencies": { | ||
"dojo": "1.15.0" | ||
"dojo": "1.15.1" | ||
}, | ||
@@ -21,0 +21,0 @@ "devDependencies": { |
{ | ||
"name": "dijit", | ||
"version": "1.15.0", | ||
"version": "1.15.1", | ||
"directories": { | ||
@@ -9,3 +9,3 @@ "lib": "." | ||
"dependencies": { | ||
"dojo": "1.15.0" | ||
"dojo": "1.15.1" | ||
}, | ||
@@ -12,0 +12,0 @@ "description": "Dijit provides a complete collection of user interface controls based on Dojo, giving you the power to create web applications that are highly optimized for usability, performance, internationalization, accessibility, but above all deliver an incredible user experience.", |
Sorry, the diff of this file is not supported yet
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
5549982
54455
+ Addeddojo@1.15.1(transitive)
- Removeddojo@1.15.0(transitive)
Updateddojo@1.15.1