Skip to content
This repository has been archived by the owner on Apr 12, 2024. It is now read-only.

Commit

Permalink
fix(startingTag): make tag name always lowercase
Browse files Browse the repository at this point in the history
some browsers (IE) always provide the nodeName as upper-case
  • Loading branch information
IgorMinar committed Jun 8, 2012
1 parent 9be82d9 commit 5c95b8c
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 11 deletions.
4 changes: 3 additions & 1 deletion src/Angular.js
Original file line number Diff line number Diff line change
Expand Up @@ -755,7 +755,9 @@ function startingTag(element) {
// are not allowed to have children. So we just ignore it.
element.html('');
} catch(e) {}
return jqLite('<div>').append(element).html().match(/^(<[^>]+>)/)[1];
return jqLite('<div>').append(element).html().
match(/^(<[^>]+>)/)[1].
replace(/^<([\w\-]+)/, function(match, nodeName) { return '<' + lowercase(nodeName); });
}


Expand Down
4 changes: 2 additions & 2 deletions test/AngularSpec.js
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ describe('angular', function() {

describe('elementHTML', function() {
it('should dump element', function() {
expect(lowercase(startingTag('<div attr="123">something<span></span></div>'))).
expect(startingTag('<div attr="123">something<span></span></div>')).
toEqual('<div attr="123">');
});
});
Expand Down Expand Up @@ -541,7 +541,7 @@ describe('angular', function() {
describe('startingElementHtml', function(){
it('should show starting element tag only', function(){
expect(startingTag('<ng-abc x="2A"><div>text</div></ng-abc>')).
toBeOneOf('<ng-abc x="2A">', '<NG-ABC x="2A">');
toBe('<ng-abc x="2A">');
});
});

Expand Down
14 changes: 6 additions & 8 deletions test/ng/compileSpec.js
Original file line number Diff line number Diff line change
Expand Up @@ -824,8 +824,8 @@ describe('$compile', function() {
inject(function($compile){
expect(function() {
$compile('<div><div class="sync async"></div></div>');
}).toThrow('Multiple directives [sync, async] asking for template on: <'+
(msie <= 8 ? 'DIV' : 'div') + ' class="sync async">');
}).toThrow('Multiple directives [sync, async] asking for template on: '+
'<div class="sync async">');
});
});

Expand Down Expand Up @@ -1212,8 +1212,7 @@ describe('$compile', function() {
expect(function(){
$compile('<div class="iscope-a; scope-b"></div>');
}).toThrow('Multiple directives [iscopeA, scopeB] asking for isolated scope on: ' +
'<' + (msie < 9 ? 'DIV' : 'div') +
' class="iscope-a; scope-b ng-isolate-scope ng-scope">');
'<div class="iscope-a; scope-b ng-isolate-scope ng-scope">');
})
);

Expand All @@ -1223,8 +1222,7 @@ describe('$compile', function() {
expect(function(){
$compile('<div class="iscope-a; iscope-b"></div>');
}).toThrow('Multiple directives [iscopeA, iscopeB] asking for isolated scope on: ' +
'<' + (msie < 9 ? 'DIV' : 'div') +
' class="iscope-a; iscope-b ng-isolate-scope ng-scope">');
'<div class="iscope-a; iscope-b ng-isolate-scope ng-scope">');
})
);

Expand Down Expand Up @@ -1978,8 +1976,8 @@ describe('$compile', function() {
inject(function($compile) {
expect(function() {
$compile('<div class="first second"></div>');
}).toThrow('Multiple directives [first, second] asking for transclusion on: <' +
(msie <= 8 ? 'DIV' : 'div') + ' class="first second ng-isolate-scope ng-scope">');
}).toThrow('Multiple directives [first, second] asking for transclusion on: ' +
'<div class="first second ng-isolate-scope ng-scope">');
});
});

Expand Down

0 comments on commit 5c95b8c

Please sign in to comment.