kylefang/angular.js
1
0
Fork 0
mirror of https://github.com/zhigang1992/angular.js.git synced 2026-04-29 05:15:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixes to enable ie

Browse Source
This commit is contained in:
Misko Hevery
2010-04-20 18:14:13 -07:00
parent 259c2bba4b
commit 22d93e0a3b
14 changed files with 82 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/nodeserver/server.js Normal file
View File

@@ -0,0 +1,21 @@
var sys = require('sys'),
http = require('http'),
fs = require('fs');
http.createServer(function (req, res) {
res.writeHead(200, {});
sys.p('GET ' + req.url);
var file = fs.createReadStream('.' + req.url);
file.addListener('data', bind(res, res.write));
file.addListener('error', function( error ){
sys.p(error);
res.end();
});
file.addListener('close', bind(res, res.end));
}).listen(8000);
sys.puts('Server running at http://127.0.0.1:8000/');
function bind(_this, _fn) {
return function(){
return _fn.apply(_this, arguments);
};
}

1
nodeserver.sh Executable file
View File

@@ -0,0 +1 @@
node lib/nodeserver/server.js

13
scenario/widgets.html
View File

@@ -1,11 +1,11 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head> <head>
<link rel="stylesheet" type="text/css" href="style.css"></link> <link rel="stylesheet" type="text/css" href="style.css"/><!--
<script type="text/javascript" src="../lib/jquery/jquery-1.4.2.js"></script> <script type="text/javascript" src="../lib/jquery/jquery-1.4.2.js"></script>
<script type="text/javascript" src="../src/angular-bootstrap.js#autobind"></script> --><script type="text/javascript" src="../src/angular-bootstrap.js#autobind"></script>
</head> </head>
<body ng-init="$window.$scope = this"> <body ng:init="$window.$scope = this">
<table> <table>
<tr> <tr>
<th width="330">Description</th> <th width="330">Description</th>
@@ -72,12 +72,12 @@
<tr><th colspan="3">Buttons</th></tr> <tr><th colspan="3">Buttons</th></tr>
<tr> <tr>
<td>ng-change<br/>ng-click</td> <td>ng-change<br/>ng-click</td>
<td> <td ng:init="button.count = 0">
<form ng-init="button.count = 0"> <form>
<input type="button" value="button" ng-change="button.count = button.count + 1"/> <br/> <input type="button" value="button" ng-change="button.count = button.count + 1"/> <br/>
<input type="submit" value="submit" ng-change="button.count = button.count + 1"/><br/> <input type="submit" value="submit" ng-change="button.count = button.count + 1"/><br/>
<input type="image" src="" ng-change="button.count = button.count + 1"/><br/> <input type="image" src="" ng-change="button.count = button.count + 1"/><br/>
<a href="" ng-click="button.count = button.count + 1">action</a> <a href="" ng:click="button.count = button.count + 1">action</a>
</form> </form>
</td> </td>
<td>button={{button}}</td> <td>button={{button}}</td>
@@ -93,5 +93,6 @@
<td></td> <td></td>
</tr> </tr>
</table> </table>
-->
</body> </body>
</html> </html>

3
src/Angular.js
View File

@@ -112,7 +112,8 @@ function uppercase(value){ return isString(value) ? value.toUpperCase() : value;
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 nodeName(element) { return (element[0] || element).nodeName; } function nodeName(element) { return (element[0] || element).nodeName; }
function isElement(node) { function isElement(node) {
if (node && node[0]) node = node[0]; if (node && !node.item && isDefined(node.length) && isDefined(node[0]))
node = node[0];
return node && node.nodeName; return node && node.nodeName;
} }

9
src/Browser.js
View File

@@ -29,7 +29,7 @@ Browser.prototype = {
bind: function() { bind: function() {
var self = this; var self = this;
self.document.bind("mouseover", function(event){ self.document.bind("mouseover", function(event){
self.hoverListener(jqLite(event.target), true); self.hoverListener(jqLite(msie ? event.srcElement : event.target), true);
return true; return true;
}); });
self.document.bind("mouseleave mouseout click dblclick keypress keyup", function(event){ self.document.bind("mouseleave mouseout click dblclick keypress keyup", function(event){
@@ -43,8 +43,11 @@ Browser.prototype = {
}, },
addCss: function(url) { addCss: function(url) {
var head = jqLite(this.document[0].getElementsByTagName('head')[0]), var doc = this.document[0],
link = jqLite('<link rel="stylesheet" type="text/css"></link>'); head = jqLite(doc.getElementsByTagName('head')[0]),
link = jqLite(doc.createElement('link'));
link.attr('rel', 'stylesheet');
link.attr('type', 'text/css');
link.attr('href', url); link.attr('href', url);
head.append(link); head.append(link);
}, },

2
src/Compiler.js
View File

@@ -185,7 +185,7 @@ function eachAttribute(element, fn){
var i, attrs = element[0].attributes || [], chld, attr, name, value, attrValue = {}; var i, attrs = element[0].attributes || [], chld, attr, name, value, attrValue = {};
for (i = 0; i < attrs.length; i++) { for (i = 0; i < attrs.length; i++) {
attr = attrs[i]; attr = attrs[i];
name = attr.name; name = attr.name.replace(':', '-');
value = attr.value; value = attr.value;
if (msie && name == 'href') { if (msie && name == 'href') {
value = decodeURIComponent(element[0].getAttribute(name, 2)); value = decodeURIComponent(element[0].getAttribute(name, 2));

15
src/directives.js
View File

@@ -26,15 +26,20 @@ angularDirective("ng-bind", function(expression){
return function(element) { return function(element) {
var lastValue, lastError; var lastValue, lastError;
this.$onEval(function() { this.$onEval(function() {
var error, value = this.$tryEval(expression, function(e){ var error,
error = toJson(e); value = this.$tryEval(expression, function(e){
}); error = toJson(e);
}),
isElem = isElement(value);
if (!isElem && isObject(value)) {
value = toJson(value);
}
if (value != lastValue || error != lastError) { if (value != lastValue || error != lastError) {
lastValue = value; lastValue = value;
lastError = error; lastError = error;
elementError(element, NG_EXCEPTION, error); elementError(element, NG_EXCEPTION, error);
if (error) value = error; if (error) value = error;
if (isElement(value)) { if (isElem) {
element.html(''); element.html('');
element.append(value); element.append(value);
} else { } else {
@@ -177,7 +182,7 @@ angularWidget("@ng-repeat", function(expression, element){
angularDirective("ng-click", function(expression, element){ angularDirective("ng-click", function(expression, element){
return function(element){ return function(element){
var self = this; var self = this;
element.click(function(){ element.bind('click', function(){
self.$tryEval(expression, element); self.$tryEval(expression, element);
self.$root.$eval(); self.$root.$eval();
return false; return false;

24
src/jqLite.js
View File

@@ -37,14 +37,14 @@ function jqClearData(element) {
} }
function JQLite(element) { function JQLite(element) {
if (element.length && element.item) { if (isElement(element)) {
this[0] = element;
this.length = 1;
} else if (isDefined(element.length) && element.item) {
for(var i=0; i < element.length; i++) { for(var i=0; i < element.length; i++) {
this[i] = element[i]; this[i] = element[i];
} }
this.length = element.length; this.length = element.length;
} else {
this[0] = element;
this.length = 1;
} }
} }
@@ -92,8 +92,13 @@ JQLite.prototype = {
bubbleEvent = bubbleEvent || fn.call(self, event); bubbleEvent = bubbleEvent || fn.call(self, event);
}); });
if (!bubbleEvent) { if (!bubbleEvent) {
event.preventDefault(); if (msie) {
event.stopPropagation(); event.returnValue = false;
event.cancelBubble = true;
} else {
event.preventDefault();
event.stopPropagation();
}
} }
}; };
eventHandler.fns = []; eventHandler.fns = [];
@@ -109,13 +114,6 @@ JQLite.prototype = {
this[0].dispatchEvent(evnt); this[0].dispatchEvent(evnt);
}, },
click: function(fn) {
if (fn)
this.bind('click', fn);
else
this.trigger('click');
},
replaceWith: function(replaceNode) { replaceWith: function(replaceNode) {
this[0].parentNode.replaceChild(jqLite(replaceNode)[0], this[0]); this[0].parentNode.replaceChild(jqLite(replaceNode)[0], this[0]);
}, },

6
src/scenario/Steps.js
View File

@@ -29,14 +29,14 @@ angular.scenario.WHEN = {
// emulate the browser behavior which causes it // emulate the browser behavior which causes it
// to be overridden at the end. // to be overridden at the end.
var checked = input.checked = !input.checked; var checked = input.checked = !input.checked;
element.click(); element.trigger('click');
input.checked = checked; input.checked = checked;
}, },
select:function(){ select:function(){
var element = this.element(this.at); var element = this.element(this.at);
var path = "option[value=" + this.option + "]"; var path = "option[value=" + this.option + "]";
var option = this.assert(element.find(path)); var option = this.assert(element.find(path));
option[0].selected = !option[0].selected; option[0].selected = !option[0].selected;
element.change(); element.change();
} }
}; };
@@ -48,7 +48,7 @@ angular.scenario.THEN = {
if (_.isArray(this.should_be)) if (_.isArray(this.should_be))
should_be = JSON.stringify(should_be); should_be = JSON.stringify(should_be);
if (element.text() != should_be) if (element.text() != should_be)
throw "Expected " + should_be + throw "Expected " + should_be +
" but was " + element.text() + "."; " but was " + element.text() + ".";
} }
}, },

2
test.sh
View File

@@ -1 +1 @@
java -jar lib/jstestdriver/JsTestDriver.jar --tests BinderTest java -jar lib/jstestdriver/JsTestDriver.jar --tests all

14
test/BinderTest.js
View File

@@ -151,7 +151,7 @@ BinderTest.prototype.testInputTypeButtonActionExecutesInScope = function(){
c.scope.$set("person.save", function(){ c.scope.$set("person.save", function(){
savedCalled = true; savedCalled = true;
}); });
c.node.click(); c.node.trigger('click');
assertTrue(savedCalled); assertTrue(savedCalled);
}; };
@@ -162,7 +162,7 @@ BinderTest.prototype.testInputTypeButtonActionExecutesInScope2 = function(){
log += 'click;'; log += 'click;';
}); });
expect(log).toEqual(''); expect(log).toEqual('');
c.node.click(); c.node.trigger('click');
expect(log).toEqual('click;'); expect(log).toEqual('click;');
}; };
@@ -172,7 +172,7 @@ BinderTest.prototype.testButtonElementActionExecutesInScope = function(){
c.scope.$set("person.save", function(){ c.scope.$set("person.save", function(){
savedCalled = true; savedCalled = true;
}); });
c.node.click(); c.node.trigger('click');
assertTrue(savedCalled); assertTrue(savedCalled);
}; };
@@ -435,13 +435,13 @@ BinderTest.prototype.testActionOnAHrefThrowsError = function(){
throw {a:'abc', b:2}; throw {a:'abc', b:2};
}; };
var input = c.node; var input = c.node;
input.click(); input.trigger('click');
assertEquals({a:"abc", b:2}, fromJson(input.attr('ng-exception'))); assertEquals({a:"abc", b:2}, fromJson(input.attr('ng-exception')));
assertTrue("should have an error class", input.hasClass('ng-exception')); assertTrue("should have an error class", input.hasClass('ng-exception'));
// TODO: I think that exception should never get cleared so this portion of test makes no sense // TODO: I think that exception should never get cleared so this portion of test makes no sense
//c.scope.action = noop; //c.scope.action = noop;
//input.click(); //input.trigger('click');
//dump(input.attr('ng-error')); //dump(input.attr('ng-error'));
//assertFalse('error class should be cleared', input.hasClass('ng-exception')); //assertFalse('error class should be cleared', input.hasClass('ng-exception'));
}; };
@@ -574,10 +574,10 @@ BinderTest.prototype.testItShouldDisplayErrorWhenActionIsSyntacticlyIncorect = f
var first = jqLite(c.node[0].childNodes[0]); var first = jqLite(c.node[0].childNodes[0]);
var second = jqLite(c.node[0].childNodes[1]); var second = jqLite(c.node[0].childNodes[1]);
first.click(); first.trigger('click');
assertEquals("ABC", c.scope.greeting); assertEquals("ABC", c.scope.greeting);
second.click(); second.trigger('click');
assertTrue(second.hasClass("ng-exception")); assertTrue(second.hasClass("ng-exception"));
}; };

9
test/CompilerSpec.js
View File

@@ -75,21 +75,22 @@ describe('compiler', function(){
it('should allow creation of templates', function(){ it('should allow creation of templates', function(){
directives.duplicate = function(expr, element){ directives.duplicate = function(expr, element){
var parent = element.parent();
element.replaceWith(document.createComment("marker")); element.replaceWith(document.createComment("marker"));
element.removeAttr("duplicate"); element.removeAttr("duplicate");
var template = this.compile(element); var template = this.compile(element);
return function(marker) { return function(marker) {
this.$onEval(function() { this.$onEval(function() {
marker.after(template(element.clone()).element); marker.after(template(element.clone()).$element);
}); });
}; };
}; };
var scope = compile('before<span duplicate="expr">x</span>after'); var scope = compile('before<span duplicate="expr">x</span>after');
expect(sortedHtml(scope.$element)).toEqual('<div>before<#comment></#comment>after</div>'); expect(sortedHtml(scope.$element)).toEqual('<div>before<#comment></#comment><span>x</span>after</div>');
scope.$eval(); scope.$eval();
expect(sortedHtml(scope.$element)).toEqual('<div>before<#comment></#comment>after</div>'); expect(sortedHtml(scope.$element)).toEqual('<div>before<#comment></#comment><span>x</span><span>x</span>after</div>');
scope.$eval(); scope.$eval();
expect(sortedHtml(scope.$element)).toEqual('<div>before<#comment></#comment>after</div>'); expect(sortedHtml(scope.$element)).toEqual('<div>before<#comment></#comment><span>x</span><span>x</span><span>x</span>after</div>');
}); });
it('should process markup before directives', function(){ it('should process markup before directives', function(){

2
test/directivesSpec.js
View File

@@ -133,7 +133,7 @@ describe("directives", function(){
scope.$eval(); scope.$eval();
expect(scope.$get('clicked')).toBeFalsy(); expect(scope.$get('clicked')).toBeFalsy();
element.click(); element.trigger('click');
expect(scope.$get('clicked')).toEqual(true); expect(scope.$get('clicked')).toEqual(true);
}); });

12
test/widgetsSpec.js
View File

@@ -136,23 +136,23 @@ describe("input widget", function(){
it('should call ng-change on button click', function(){ it('should call ng-change on button click', function(){
compile('<input type="button" value="Click Me" ng-change="clicked = true"/>'); compile('<input type="button" value="Click Me" ng-change="clicked = true"/>');
element.click(); element.trigger('click');
expect(scope.$get('clicked')).toEqual(true); expect(scope.$get('clicked')).toEqual(true);
}); });
it('should support button alias', function(){ it('should support button alias', function(){
compile('<button ng-change="clicked = true">Click Me</button>'); compile('<button ng-change="clicked = true">Click Me</button>');
element.click(); element.trigger('click');
expect(scope.$get('clicked')).toEqual(true); expect(scope.$get('clicked')).toEqual(true);
}); });
it('should type="checkbox"', function(){ it('should type="checkbox"', function(){
compile('<input type="checkbox" name="checkbox" checked ng-change="action = true"/>'); compile('<input type="checkbox" name="checkbox" checked ng-change="action = true"/>');
expect(scope.checkbox).toEqual(true); expect(scope.checkbox).toEqual(true);
trigger(element, 'click'); element.trigger('click');
expect(scope.checkbox).toEqual(false); expect(scope.checkbox).toEqual(false);
expect(scope.action).toEqual(true); expect(scope.action).toEqual(true);
trigger(element, 'click'); element.trigger('click');
expect(scope.checkbox).toEqual(true); expect(scope.checkbox).toEqual(true);
}); });
@@ -176,7 +176,7 @@ describe("input widget", function(){
expect(b.checked).toEqual(true); expect(b.checked).toEqual(true);
expect(scope.clicked).not.toBeDefined(); expect(scope.clicked).not.toBeDefined();
trigger(a, 'click'); jqLite(a).trigger('click');
expect(scope.chose).toEqual('A'); expect(scope.chose).toEqual('A');
expect(scope.clicked).toEqual(1); expect(scope.clicked).toEqual(1);
}); });
@@ -218,7 +218,7 @@ describe("input widget", function(){
it('should report error on ng-change exception', function(){ it('should report error on ng-change exception', function(){
compile('<button ng-change="a-2=x">click</button>'); compile('<button ng-change="a-2=x">click</button>');
element.click(); element.trigger('click');
expect(element.hasClass('ng-exception')).toBeTruthy(); expect(element.hasClass('ng-exception')).toBeTruthy();
}); });