cargdev/angular
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(): use const and let instead of var

Browse Source
This commit is contained in:
Joao Dias
2016-11-12 14:08:58 +01:00
committed by Victor Berchet
parent 73593d4bf3
commit 77ee27c59e
435 changed files with 4637 additions and 4663 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
modules/angular1_router/src/ng_outlet.ts
View File

@ -25,7 +25,7 @@
* The value for the `ngOutlet` attribute is optional.
*/
function ngOutletDirective($animate, $q: ng.IQService, $rootRouter) {
let rootRouter = $rootRouter;
const rootRouter = $rootRouter;
return {
restrict: 'AE',
@ -67,7 +67,7 @@ function ngOutletDirective($animate, $q: ng.IQService, $rootRouter) {
reuse(instruction) {
let next = $q.when(true);
let previousInstruction = this.currentInstruction;
const previousInstruction = this.currentInstruction;
this.currentInstruction = instruction;
if (this.currentController && this.currentController.$routerOnReuse) {
next = $q.when(
@ -111,7 +111,7 @@ function ngOutletDirective($animate, $q: ng.IQService, $rootRouter) {
this.previousInstruction = this.currentInstruction;
this.currentInstruction = instruction;
let componentName = this.controller.$$componentName = instruction.componentType;
const componentName = this.controller.$$componentName = instruction.componentType;
if (typeof componentName !== 'string') {
throw new Error('Component is not a string for ' + instruction.urlPath);
@ -122,13 +122,13 @@ function ngOutletDirective($animate, $q: ng.IQService, $rootRouter) {
this.controller.$$router = this.router.childRouter(instruction.componentType);
this.controller.$$outlet = this;
let newScope = scope.$new();
const newScope = scope.$new();
newScope.$$router = this.controller.$$router;
this.deferredActivation = $q.defer();
let clone = $transclude(newScope, clone => {});
const clone = $transclude(newScope, clone => {});
let activateView = () => {
const activateView = () => {
$animate.enter(clone, null, this.currentElement || element);
this.cleanupLastView();
this.currentElement = clone;
@ -139,7 +139,7 @@ function ngOutletDirective($animate, $q: ng.IQService, $rootRouter) {
}
}
let parentCtrl = ctrls[0], myCtrl = ctrls[1],
const parentCtrl = ctrls[0], myCtrl = ctrls[1],
router = (parentCtrl && parentCtrl.$$router) || rootRouter;
myCtrl.$$currentComponent = null;
@ -156,7 +156,7 @@ function ngOutletFillContentDirective($compile) {
priority: -400,
require: 'ngOutlet',
link: (scope, element, attrs, ctrl) => {
let template = ctrl.$$template;
const template = ctrl.$$template;
element.html(template);
$compile(element.contents())(scope);
}
@ -170,9 +170,9 @@ function routerTriggerDirective($q) {
require: '^ngOutlet',
priority: -1000,
link: function(scope, element, attr, ngOutletCtrl) {
var promise = $q.when();
var outlet = ngOutletCtrl.$$outlet;
var currentComponent = outlet.currentController =
let promise = $q.when();
const outlet = ngOutletCtrl.$$outlet;
const currentComponent = outlet.currentController =
element.controller(ngOutletCtrl.$$componentName);
if (currentComponent.$routerOnActivate) {
promise = $q.when(currentComponent.$routerOnActivate(outlet.currentInstruction,
@ -212,13 +212,13 @@ function ngLinkDirective($rootRouter, $parse) {
return {require: '?^^ngOutlet', restrict: 'A', link: ngLinkDirectiveLinkFn};
function ngLinkDirectiveLinkFn(scope, element, attrs, ctrl) {
let router = (ctrl && ctrl.$$router) || $rootRouter;
const router = (ctrl && ctrl.$$router) || $rootRouter;
if (!router) {
return;
}
let navigationInstruction = null;
let link = attrs.ngLink || '';
const link = attrs.ngLink || '';
function getLink(params) {
if (!params) {
@ -240,10 +240,10 @@ function ngLinkDirective($rootRouter, $parse) {
return $rootRouter._location.prepareExternalUrl(navigationHref);
}
let routeParamsGetter = $parse(link);
const routeParamsGetter = $parse(link);
// we can avoid adding a watcher if it's a literal
if (routeParamsGetter.constant) {
let params = routeParamsGetter();
const params = routeParamsGetter();
element.attr('href', getLink(params));
} else {
scope.$watch(() => routeParamsGetter(scope), params => element.attr('href', getLink(params)),