fix(view): only run ng1 route-to-component code if component: is a st…

…ring
angular-ui · Apr 5, 2016 · ec1c534 · ec1c534
1 parent 3fc2012
commit ec1c534
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/ng1/viewDirective.ts b/src/ng1/viewDirective.ts
@@ -1,7 +1,7 @@
 /** @module ng1_directives */ /** for typedoc */
 "use strict";
 import {extend, map, unnestR, filter} from "../common/common";
-import {isDefined, isFunction} from "../common/predicates";
+import {isDefined, isFunction, isString} from "../common/predicates";
 import {trace} from "../common/trace";
 import {ActiveUIView} from "../view/interface";
 import {Ng1ViewConfig} from "./viewsBuilder";
@@ -357,7 +357,7 @@ function $ViewDirectiveFill (  $compile,   $controller,   $transitions,   $view,
         }
 
         // Wait for the component to appear in the DOM
-        if (cfg.viewDecl.component) {
+        if (isString(cfg.viewDecl.component)) {
           let cmp = cfg.viewDecl.component;
           let kebobName = kebobString(cmp);
           let getComponentController = () => {

diff --git a/src/ng1/viewsBuilder.ts b/src/ng1/viewsBuilder.ts
@@ -49,7 +49,8 @@ export function ng1ViewsBuilder(state: State) {
       config.templateProvider = ['$injector', function($injector) {
         const resolveFor = key => config.bindings && config.bindings[key] || key;
         const prefix = angular.version.minor >= 3 ? "::" : "";
-        let attrs = getComponentInputs($injector, config.component).map(key => `${kebobString(key)}='${prefix}$resolve.${resolveFor(key)}'`).join(" ");
+        let attrs = getComponentInputs($injector, config.component)
+            .map(key => `${kebobString(key)}='${prefix}$resolve.${resolveFor(key)}'`).join(" ");
         let kebobName = kebobString(config.component);
         return `<${kebobName} ${attrs}></${kebobName}>`;
       }];