javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2026-03-13 10:22:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(nav): correct element structure for nav-vew

Browse Source 
Ensure that the entering view template is contained by one element, and
that one element has the `pane` class.
This commit is contained in:
Adam Bradley
2014-11-11 21:48:09 -06:00
parent 29a00c4342
commit 2b23957558
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
js/angular/service/viewSwitcher.js vendored
View File

@@ -8,10 +8,11 @@ IonicModule
'$timeout',
'$compile',
'$controller',
'$document',
'$ionicClickBlock',
'$ionicConfig',
'$ionicNavBarDelegate',
function($timeout, $compile, $controller, $ionicClickBlock, $ionicConfig, $ionicNavBarDelegate) {
function($timeout, $compile, $controller, $document, $ionicClickBlock, $ionicConfig, $ionicNavBarDelegate) {
var TRANSITIONEND_EVENT = 'webkitTransitionEnd transitionend';
var DATA_NO_CACHE = '$noCache';
@@ -36,19 +37,16 @@ function($timeout, $compile, $controller, $ionicClickBlock, $ionicConfig, $ionic
function createViewElement(viewLocals) {
var div = jqLite('<div>');
var containerEle = $document[0].createElement('div');
if (viewLocals && viewLocals.$template) {
div.html(viewLocals.$template);
var nodes = div.contents();
for (var i = 0; i < nodes.length; i++) {
if (nodes[i].nodeType == 1) {
// first try to get just a child element
return nodes.eq(i);
}
containerEle.innerHTML = viewLocals.$template;
if (containerEle.children.length === 1) {
containerEle.children[0].classList.add('pane');
return jqLite(containerEle.children[0]);
}
}
// fallback to return the div so it has one parent element
return div;
containerEle.className = "pane";
return jqLite(containerEle);
}
function getViewElementIdentifier(locals, view) {