aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIgor Minar2012-08-29 04:01:13 -0700
committerIgor Minar2012-08-30 10:52:36 -0700
commitbb9badeb2a53698218ef891e7ae6d0e3a810fe9b (patch)
treeb21e133e28bd29a374ec6e0170fe47c2a44c9e14
parentc287c8361dedbd8a77c9d60eb93abb3b50e9edcd (diff)
downloadangular.js-bb9badeb2a53698218ef891e7ae6d0e3a810fe9b.tar.bz2
fix(jqLite): better support for xhtml
it turns out that some stuff doesn't work in xhtml as it does in html. for example   can't be innerHTML-ed and auto-closing of elements doesn't work. the reporter of the referenced issue claimed that innerHTML vs text on script made a difference but that doesn't appear to be true in my testing. I'm not including test for this because testacular doesn't currently run tests in xhtml yet. Closes #1301
-rw-r--r--src/jqLite.js2
-rw-r--r--src/ng/compile.js2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/jqLite.js b/src/jqLite.js
index d0127076..1ba270b6 100644
--- a/src/jqLite.js
+++ b/src/jqLite.js
@@ -165,7 +165,7 @@ function JQLite(element) {
var div = document.createElement('div');
// Read about the NoScope elements here:
// http://msdn.microsoft.com/en-us/library/ms533897(VS.85).aspx
- div.innerHTML = '<div>&nbsp;</div>' + element; // IE insanity to make NoScope elements work!
+ div.innerHTML = '<div>&#160;</div>' + element; // IE insanity to make NoScope elements work!
div.removeChild(div.firstChild); // remove the superfluous div
JQLiteAddNodes(this, div.childNodes);
this.remove(); // detach the elements from the temporary DOM div.
diff --git a/src/ng/compile.js b/src/ng/compile.js
index 89f46af6..a569ca8e 100644
--- a/src/ng/compile.js
+++ b/src/ng/compile.js
@@ -319,7 +319,7 @@ function $CompileProvider($provide) {
// not be able to attach scope data to them, so we will wrap them in <span>
forEach($compileNode, function(node, index){
if (node.nodeType == 3 /* text node */) {
- $compileNode[index] = jqLite(node).wrap('<span>').parent()[0];
+ $compileNode[index] = jqLite(node).wrap('<span></span>').parent()[0];
}
});
var compositeLinkFn = compileNodes($compileNode, transcludeFn, $compileNode, maxPriority);