Hopiu/angular.js
1
0
Fork 0
mirror of https://github.com/Hopiu/angular.js.git synced 2026-05-09 15:24:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rename nodeName due to conflicts with jquery

Browse source
This commit is contained in:
Igor Minar 2011-01-05 23:56:57 -08:00
parent bdc251c5a5
commit bd5ec7c32a
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/Angular.js
View file

@ -108,7 +108,7 @@ var _undefined = undefined,
/** @name angular.service */ /** @name angular.service */
angularService = extensionMap(angular, 'service'), angularService = extensionMap(angular, 'service'),
angularCallbacks = extensionMap(angular, 'callbacks'), angularCallbacks = extensionMap(angular, 'callbacks'),
nodeName, nodeName_,
rngScript = /^(|.*\/)angular(-.*?)?(\.min)?.js(\?[^#]*)?(#(.*))?$/, rngScript = /^(|.*\/)angular(-.*?)?(\.min)?.js(\?[^#]*)?(#(.*))?$/,
DATE_ISOSTRING_LN = 24; DATE_ISOSTRING_LN = 24;
@ -408,7 +408,7 @@ function isFunction(value){ return typeof value == $function;}
function isBoolean(value) { return typeof value == $boolean;} function isBoolean(value) { return typeof value == $boolean;}
function isTextNode(node) { return nodeName(node) == '#text'; } function isTextNode(node) { return nodeName_(node) == '#text'; }
function trim(value) { return isString(value) ? value.replace(/^\s*/, '').replace(/\s*$/, '') : value; } function trim(value) { return isString(value) ? value.replace(/^\s*/, '').replace(/\s*$/, '') : value; }
function isElement(node) { function isElement(node) {
return node && (node.nodeName || node instanceof JQLite || (jQuery && node instanceof jQuery)); return node && (node.nodeName || node instanceof JQLite || (jQuery && node instanceof jQuery));
@ -432,12 +432,12 @@ function HTML(html, option) {
} }
if (msie) { if (msie) {
nodeName = function(element) { nodeName_ = function(element) {
element = element.nodeName ? element : element[0]; element = element.nodeName ? element : element[0];
return (element.scopeName && element.scopeName != 'HTML' ) ? uppercase(element.scopeName + ':' + element.nodeName) : element.nodeName; return (element.scopeName && element.scopeName != 'HTML' ) ? uppercase(element.scopeName + ':' + element.nodeName) : element.nodeName;
}; };
} else { } else {
nodeName = function(element) { nodeName_ = function(element) {
return element.nodeName ? element.nodeName : element[0].nodeName; return element.nodeName ? element.nodeName : element[0].nodeName;
}; };
} }

2
src/Compiler.js
View file

@ -181,7 +181,7 @@ Compiler.prototype = {
directiveFns = self.directives, directiveFns = self.directives,
descend = true, descend = true,
directives = true, directives = true,
elementName = nodeName(element), elementName = nodeName_(element),
template, template,
selfApi = { selfApi = {
compile: bind(self, self.compile), compile: bind(self, self.compile),

2
src/markups.js
View file

@ -59,7 +59,7 @@ angularTextMarkup('{{}}', function(text, textNode, parentElement) {
// TODO: this should be widget not a markup // TODO: this should be widget not a markup
angularTextMarkup('OPTION', function(text, textNode, parentElement){ angularTextMarkup('OPTION', function(text, textNode, parentElement){
if (nodeName(parentElement) == "OPTION") { if (nodeName_(parentElement) == "OPTION") {
var select = document.createElement('select'); var select = document.createElement('select');
select.insertBefore(parentElement[0].cloneNode(true), _null); select.insertBefore(parentElement[0].cloneNode(true), _null);
if (!select.innerHTML.match(/<option(\s.*\s|\s)value\s*=\s*.*>.*<\/\s*option\s*>/gi)) { if (!select.innerHTML.match(/<option(\s.*\s|\s)value\s*=\s*.*>.*<\/\s*option\s*>/gi)) {

2
src/scenario/Scenario.js
View file

@ -244,7 +244,7 @@ function browserTrigger(element, type) {
'select-multiple': 'change' 'select-multiple': 'change'
}[element.type] || 'click'; }[element.type] || 'click';
} }
if (lowercase(nodeName(element)) == 'option') { if (lowercase(nodeName_(element)) == 'option') {
element.parentNode.value = element.value; element.parentNode.value = element.value;
element = element.parentNode; element = element.parentNode;
type = 'change'; type = 'change';