Skip to content

Commit

Permalink
viewport works with viewcontrols.hasOwnContext = false
Browse files Browse the repository at this point in the history
  • Loading branch information
Will Johnston committed Feb 18, 2015
1 parent b659d76 commit 444a37f
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion framework/framework/ui/controls/viewport/viewport.ts
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,12 @@ module plat.ui.controls {
}

manager.setUiControlTemplate();
return manager.observeRootContext(control, manager.fulfillAndLoad);

if (control.hasOwnContext) {
return manager.observeRootContext(control, manager.fulfillAndLoad);
}

return manager.fulfillAndLoad();
}

/**
Expand Down

0 comments on commit 444a37f

Please sign in to comment.