Skip to content

Commit

Permalink
Merge pull request #85 from ajoslin/list-scopeas
Browse files Browse the repository at this point in the history
fix(jqmLi): fix isolate scope problems with scope-as
  • Loading branch information
Tobias Bosch committed Jul 23, 2013
2 parents eac4d82 + 164ed93 commit 62d47a7
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 12 deletions.
6 changes: 3 additions & 3 deletions src/templates/jqmLiEntry.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<li class="ui-li"
jqm-once-class="{{divider ? 'ui-li-divider ui-bar-'+$theme : 'ui-li-static jqm-active-toggle'}}"
jqm-class="{'ui-first-child': $position.first, 'ui-last-child': $position.last}"
<li class="ui-li" jqm-scope-as="jqmLi"
jqm-once-class="{{$scopeAs.jqmLi.divider ? 'ui-li-divider ui-bar-'+$theme : 'ui-li-static jqm-active-toggle'}}"
jqm-class="{'ui-first-child': $scopeAs.jqmLi.$position.first, 'ui-last-child': $scopeAs.jqmLi.$position.last}"
ng-transclude>
</li>
20 changes: 13 additions & 7 deletions src/templates/jqmLiLink.html
Original file line number Diff line number Diff line change
@@ -1,12 +1,18 @@
<li class="ui-li ui-btn"
jqm-once-class="{{icon ? 'ui-li-has-arrow ui-btn-icon-'+iconpos : ''}}"
jqm-class="{'ui-first-child': $position.first, 'ui-last-child': $position.last,
'ui-li-has-thumb': hasThumb, 'ui-li-has-count': hasCount}">
<li class="ui-li ui-btn" jqm-scope-as="jqmLiLink"
jqm-once-class="{{$scopeAs.jqmLiLink.icon ? 'ui-li-has-arrow ui-btn-icon-'+$scopeAs.jqmLiLink.iconpos : ''}}"
jqm-class="{'ui-first-child': $scopeAs.jqmLiLink.$position.first,
'ui-last-child': $scopeAs.jqmLiLink.$position.last,
'ui-li-has-thumb': $scopeAs.jqmLiLink.hasThumb,
'ui-li-has-count': $scopeAs.jqmLiLink.hasCount}">
<div class="ui-btn-inner ui-li">
<div class="ui-btn-text">
<a ng-href="{{link}}" class="ui-link-inherit" ng-transclude>
<div class="ui-btn-text">
<a ng-href="{{$scopeAs.jqmLiLink.link}}" class="ui-link-inherit" ng-transclude>
</a>
</div>
<span ng-if="icon" class="ui-icon {{icon}}" jqm-class="{'ui-icon-shadow': iconShadow}">&nbsp;</span>
<span ng-show="$scopeAs.jqmLiLink.icon"
class="ui-icon {{$scopeAs.jqmLiLink.icon}}"
jqm-class="{'ui-icon-shadow': $scopeAs.jqmLiLink.iconShadow}">
&nbsp;
</span>
</div>
</li>
6 changes: 4 additions & 2 deletions src/templates/jqmListview.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
<ul class="ui-listview"
jqm-class="{'ui-listview-inset': inset, 'ui-corner-all': inset && corners, 'ui-shadow': inset && shadow}"
<ul class="ui-listview" jqm-scope-as="jqmListview"
jqm-class="{'ui-listview-inset': $scopeAs.jqmListview.inset,
'ui-corner-all': $scopeAs.jqmListview.inset && $scopeAs.jqmListview.corners,
'ui-shadow': $scopeAs.jqmListview.inset && $scopeAs.jqmListview.shadow}"
ng-transclude jqm-position-anchor>
</ul>

0 comments on commit 62d47a7

Please sign in to comment.