mirror of
https://github.com/ionic-team/ionic-framework.git
synced 2026-03-13 10:22:08 +08:00
collectionRepeat: a few fixes and tweaks
This commit is contained in:
@@ -5,8 +5,10 @@
|
||||
|
||||
<title>Collection-Repeat: Early Preview</title>
|
||||
|
||||
<link href="http://code.ionicframework.com/nightly/css/ionic.css" rel="stylesheet">
|
||||
<script src="http://code.ionicframework.com/nightly/js/ionic.bundle.js"></script>
|
||||
<!-- <link href="http://code.ionicframework.com/nightly/css/ionic.css" rel="stylesheet"> -->
|
||||
<!-- <script src="http://code.ionicframework.com/nightly/js/ionic.bundle.js"></script> -->
|
||||
<link href="../../dist/css/ionic.css" rel="stylesheet">
|
||||
<script src="../../dist/js/ionic.bundle.js"></script>
|
||||
<link href="style.css" rel="stylesheet">
|
||||
<script src="script.js"></script>
|
||||
<script src="contacts.js"></script>
|
||||
@@ -30,33 +32,38 @@
|
||||
</ion-header-bar>
|
||||
<ion-content>
|
||||
<div class="list">
|
||||
<div class="item"
|
||||
<a class="item"
|
||||
collection-repeat="item in getContacts()"
|
||||
collection-item-height="getItemHeight(item)"
|
||||
ng-href="https://www.google.com/#q={{item.first_name + '+' + item.last_name}}"
|
||||
ng-style="{height: getItemHeight(item), 'line-height': getItemHeight(item) + 'px', 'padding-top': 0, 'padding-bottom': 0}"
|
||||
ng-class="{'item-divider': item.isLetter}">
|
||||
<img ng-if="!item.isLetter" ng-src="http://placekitten.com/60/{{55 + ($index % 10)}}">
|
||||
{{item.letter || (item.first_name+' '+item.last_name)}}
|
||||
</div>
|
||||
</a>
|
||||
</div>
|
||||
</ion-content>
|
||||
<div class="letters has-header has-subheader" ng-if="!searchFocused">
|
||||
<div class="letter"
|
||||
ng-repeat="letter in letters"
|
||||
ng-click="goToLetter(letter)"
|
||||
ng-style="{top: (100/letters.length)*$index + '%'}">
|
||||
{{letter}}
|
||||
</div>
|
||||
</div>
|
||||
<!-- <div class="letters has-header has-subheader" ng-if="!searchFocused"> -->
|
||||
<!-- <div class="letter" -->
|
||||
<!-- ng-repeat="letter in letters" -->
|
||||
<!-- ng-click="goToLetter(letter)" -->
|
||||
<!-- ng-style="{top: (100/letters.length)*$index + '%'}"> -->
|
||||
<!-- {{letter}} -->
|
||||
<!-- </div> -->
|
||||
<!-- </div> -->
|
||||
<style>
|
||||
.letters {
|
||||
right: 0;
|
||||
bottom: 0;
|
||||
width: 25px;
|
||||
width: 50px;
|
||||
position: absolute;
|
||||
}
|
||||
.letter {
|
||||
text-align: center;
|
||||
font-size: 15px;
|
||||
height: 20px;
|
||||
height: 3.85%;
|
||||
padding-top: 1.625%;
|
||||
border: 1px solid black;
|
||||
width: 100%;
|
||||
cursor: pointer;
|
||||
right: 0;
|
||||
@@ -69,6 +76,13 @@
|
||||
top: 5px;
|
||||
color: #bbb;
|
||||
}
|
||||
.item img {
|
||||
height: 60px;
|
||||
width: 60px;
|
||||
float: left;
|
||||
margin-top: 10px;
|
||||
margin-right: 10px;
|
||||
}
|
||||
</style>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
@@ -39,7 +39,7 @@ angular.module('contactsApp', ['ionic'])
|
||||
|
||||
//Letters are shorter, everything else is 52 pixels
|
||||
$scope.getItemHeight = function(item) {
|
||||
return item.isLetter ? 38 : 52;
|
||||
return item.isLetter ? 38 : 80;
|
||||
};
|
||||
|
||||
var letterHasMatch = {};
|
||||
|
||||
@@ -261,7 +261,7 @@ describe('$collectionDataSource service', function() {
|
||||
});
|
||||
});
|
||||
|
||||
describe('setData', function() {
|
||||
describe('.setData()', function() {
|
||||
it('should set data and calculateDataDimensions()', function() {
|
||||
var source = setup();
|
||||
spyOn(source, 'calculateDataDimensions');
|
||||
|
||||
Reference in New Issue
Block a user