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

App #615

Closed
wants to merge 6 commits into from
Closed

App #615

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions angularFiles.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ angularFiles = {
'angularSrc': [
'src/Angular.js',
'src/JSON.js',
'src/Compiler.js',
'src/Scope.js',
'src/Injector.js',
'src/parser.js',
'src/Resource.js',
Expand All @@ -12,6 +10,7 @@ angularFiles = {
'src/jqLite.js',
'src/apis.js',
'src/filters.js',
'src/service/compiler.js',
'src/service/cookieStore.js',
'src/service/cookies.js',
'src/service/defer.js',
Expand All @@ -23,6 +22,7 @@ angularFiles = {
'src/service/resource.js',
'src/service/route.js',
'src/service/routeParams.js',
'src/service/scope.js',
'src/service/sniffer.js',
'src/service/window.js',
'src/service/xhr.bulk.js',
Expand Down
5 changes: 3 additions & 2 deletions example/personalLog/test/personalLogSpec.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@ describe('example.personalLog.LogCtrl', function() {
var logCtrl;

function createNotesCtrl() {
var scope = angular.scope();
scope.$cookies = scope.$service('$cookies');
var injector = angular.injector();
var scope = injector('$rootScope');
scope.$cookies = injector('$cookies');
return scope.$new(example.personalLog.LogCtrl);
}

Expand Down
12 changes: 4 additions & 8 deletions src/Angular.js
Original file line number Diff line number Diff line change
Expand Up @@ -855,11 +855,6 @@ function toBoolean(value) {
}


/** @name angular.compile */
function compile(element) {
return new Compiler(angularTextMarkup, angularAttrMarkup, angularDirective, angularWidget)
.compile(element);
}
/////////////////////////////////////////////////

/**
Expand Down Expand Up @@ -954,11 +949,12 @@ function angularInit(config, document){

if (autobind) {
var element = isString(autobind) ? document.getElementById(autobind) : document,
scope = compile(element)(createScope()),
$browser = scope.$service('$browser');
injector = createInjector(),
scope = injector('$rootScope');
injector('$compile')(element)(scope);

if (config.css)
$browser.addCss(config.base_url + config.css);
injector('$browser').addCss(config.base_url + config.css);
scope.$apply();
}
}
Expand Down
2 changes: 0 additions & 2 deletions src/AngularPublic.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ angularService('$browser', function($log, $sniffer) {
extend(angular, {
// disabled for now until we agree on public name
//'annotate': annotate,
'compile': compile,
'scope': createScope,
'copy': copy,
'extend': extend,
'equals': equals,
Expand Down
Loading