mirror of
https://github.com/Hopiu/angular.js.git
synced 2026-03-16 23:30:23 +00:00
merge
This commit is contained in:
commit
3d36942400
6 changed files with 6274 additions and 3 deletions
2
Rakefile
2
Rakefile
|
|
@ -31,7 +31,7 @@ end
|
|||
|
||||
desc 'Compile JavaScript'
|
||||
task :compile do
|
||||
Rake::Task['compileexterns'].execute
|
||||
Rake::Task['compileexterns'].execute 0
|
||||
|
||||
concat = %x(cat \
|
||||
src/angular.prefix \
|
||||
|
|
|
|||
6240
lib/jquery/jquery-1.4.2.js
vendored
Normal file
6240
lib/jquery/jquery-1.4.2.js
vendored
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -737,4 +737,3 @@ Parser.prototype = {
|
|||
}
|
||||
};
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
describe('compiler', function(){
|
||||
xdescribe('compiler', function(){
|
||||
function element(html) {
|
||||
return jQuery(html)[0];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -482,3 +482,7 @@ ParserTest.prototype.testBugStringConfusesParser = function() {
|
|||
assertEquals('!', scope.eval('suffix = "!"'));
|
||||
};
|
||||
|
||||
ParserTest.prototype.testParsingBug = function () {
|
||||
var scope = new Scope();
|
||||
assertEquals({a: "-"}, scope.eval("{a:'-'}"));
|
||||
};
|
||||
|
|
|
|||
28
test/widgetsSpec.js
Normal file
28
test/widgetsSpec.js
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
describe("widgets", function(){
|
||||
|
||||
var compile, element, scope;
|
||||
|
||||
beforeEach(function() {
|
||||
scope = null;
|
||||
element = null;
|
||||
var compiler = new Compiler(angularTextMarkup, angularAttrMarkup, angularDirective, angularWidget);
|
||||
compile = function(html) {
|
||||
element = jqLite(html);
|
||||
var view = compiler.compile(element)(element);
|
||||
view.init();
|
||||
scope = view.scope;
|
||||
};
|
||||
});
|
||||
|
||||
afterEach(function(){
|
||||
if (element) {
|
||||
element.remove();
|
||||
}
|
||||
expect(_(jqCache).size()).toEqual(0);
|
||||
});
|
||||
|
||||
it('should fail', function(){
|
||||
fail('iueoi');
|
||||
});
|
||||
|
||||
});
|
||||
Loading…
Reference in a new issue