Skip to content

Commit f408167

Browse files
dhiltdhilt
committed
jqLiteExtras demo fixes
1 parent 1298e3c commit f408167

File tree

101 files changed

+116
-1505
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

101 files changed

+116
-1505
lines changed

‎demo/adapter/adapter.html

+48-57
Original file line numberDiff line numberDiff line change
@@ -1,85 +1,76 @@
11
<!doctype html>
2-
<html ng-app="application">
2+
<html>
33
<head>
44
<meta charset="utf-8">
55
<title>Scroller Demo (adapter)</title>
66
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.14/angular.js"></script>
77
<script src="../../dist/ui-scroll.js"></script>
8-
<script src="../../dist/ui-scroll-jqlite.js"></script>
98
<script src="adapter.js"></script>
109
<link rel="stylesheet" href="../css/style.css" type="text/css"/>
11-
12-
1310
</head>
1411
<body ng-controller="mainController" ng-app="application">
1512

13+
<div class="cont cont-global">
1614

15+
<a class="back" href="../index.html">browse other examples</a>
1716

17+
<h1 class="page-header page-header-exapmle">Adapter (updatable scroller)</h1>
1818

19-
20-
<div class="cont cont-global">
21-
<a class="back" href="../index.html">browse other examples</a>
22-
<h1 class="page-header page-header-exapmle">Adapter (updatable scroller)</h1>
23-
<div class="description">
24-
<ul>
25-
<li>New mechanism of scroller data custom processing is introduced. </li>
26-
<li>Single datasource but two different viewports with two different processing adapters.</li>
27-
<li>The firstListAdapter is initially defined on ctrl $scope as a first level object with some property.</li>
28-
<li>The second.list.adapter chain is not defined on ctrl $scope. The scroller defines it during linking.</li>
29-
</ul>
30-
</div>
31-
32-
<div class="viewport-group">
33-
<h2 class="viewport-group-tilte">1st list</h2>
34-
35-
<div class="info">
36-
<span ng-hide="!firstListAdapter.isLoading">...data loading...</span>
37-
<span ng-hide="isLoadingOnScope">1st list is loaded</span>
38-
</div>
39-
40-
<div class="actions">
41-
<button class="btn btn-default" ng-click="updateList1()">update this list</button>
42-
<button class="btn btn-default" ng-click="addToList1()">add new 3d item</button>
43-
<button class="btn btn-default" ng-click="removeFromList1()">remove even items</button>
19+
<div class="description">
20+
<ul>
21+
<li>New mechanism of scroller data custom processing is introduced. </li>
22+
<li>Single datasource but two different viewports with two different processing adapters.</li>
23+
<li>The firstListAdapter is initially defined on ctrl $scope as a first level object with some property.</li>
24+
<li>The second.list.adapter chain is not defined on ctrl $scope. The scroller defines it during linking.</li>
25+
</ul>
4426
</div>
4527

46-
<div ui-scroll-viewport class="viewport viewport-height-fixed" id="viewport-adapter1">
47-
<div class="item" ui-scroll="item in datasource"
48-
adapter="firstListAdapter"
49-
is-loading="isLoadingOnScope"
50-
buffer-size='5'>{{item.content}}</div>
28+
<div class="viewport-group">
29+
<h2 class="viewport-group-tilte">1st list</h2>
30+
31+
<div class="info">
32+
<span ng-hide="!firstListAdapter.isLoading">...data loading...</span>
33+
<span ng-hide="isLoadingOnScope">1st list is loaded</span>
34+
</div>
35+
36+
<div class="actions">
37+
<button class="btn btn-default" ng-click="updateList1()">update this list</button>
38+
<button class="btn btn-default" ng-click="addToList1()">add new 3d item</button>
39+
<button class="btn btn-default" ng-click="removeFromList1()">remove even items</button>
40+
</div>
41+
42+
<div ui-scroll-viewport class="viewport viewport-height-fixed" id="viewport-adapter1">
43+
<div class="item" ui-scroll="item in datasource"
44+
adapter="firstListAdapter"
45+
is-loading="isLoadingOnScope"
46+
buffer-size='5'>{{item.content}}</div>
47+
</div>
5148
</div>
52-
</div>
53-
5449

50+
<hr>
5551

56-
<hr>
52+
<div class="viewport-group">
53+
<h2 class="viewport-group-tilte">2st list</h2>
5754

58-
<div class="viewport-group">
59-
<h2 class="viewport-group-tilte">2st list</h2>
55+
<div class="info">
56+
<span ng-hide="!second.list.adapter.isLoading">...data loading...</span>
57+
<span ng-hide="second.list.adapter.isLoading">2nd list is loaded</span>
58+
</div>
6059

61-
<div class="info">
62-
<span ng-hide="!second.list.adapter.isLoading">...data loading...</span>
63-
<span ng-hide="second.list.adapter.isLoading">2nd list is loaded</span>
64-
</div>
60+
<div class="actions">
61+
<button class="btn btn-default" ng-click="updateList2()">update this list</button>
62+
<button class="btn btn-default" ng-click="addToList2()">add new 5th item</button>
63+
<button class="btn btn-default" ng-click="removeFromList2()">remove odd items</button>
64+
</div>
6565

66-
<div class="actions">
67-
<button class="btn btn-default" ng-click="updateList2()">update this list</button>
68-
<button class="btn btn-default" ng-click="addToList2()">add new 5th item</button>
69-
<button class="btn btn-default" ng-click="removeFromList2()">remove odd items</button>
70-
</div>
66+
<div ui-scroll-viewport class="viewport viewport-height-fixed" id="viewport-adapter2">
67+
<div class="item" ui-scroll="item in datasource"
68+
adapter="second.list.adapter"
69+
buffer-size='5'>{{item.content}}</div>
70+
</div>
7171

72-
<div ui-scroll-viewport class="viewport viewport-height-fixed" id="viewport-adapter2">
73-
<div class="item" ui-scroll="item in datasource"
74-
adapter="second.list.adapter"
75-
buffer-size='5'>{{item.content}}</div>
7672
</div>
7773

7874
</div>
79-
80-
81-
</div>
82-
83-
8475
</body>
8576
</html>

‎demo/adapter/adapter.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
angular.module('application', ['ui.scroll', 'ui.scroll.jqlite']).controller('mainController', [
1+
angular.module('application', ['ui.scroll']).controller('mainController', [
22
'$scope', '$log', '$timeout', function($scope, console, $timeout) {
33
var datasource, idList1, idList2;
44
datasource = {};

‎demo/adapterOnController/adapterOnController.html

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
<title>Adapter On Controller</title>
66
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.14/angular.js"></script>
77
<script src="../../dist/ui-scroll.js"></script>
8-
<script src="../../dist/ui-scroll-jqlite.js"></script>
98
<script src="adapterOnController.js"></script>
109
<link rel="stylesheet" href="../css/style.css" type="text/css"/>
1110
</head>

‎demo/adapterOnController/adapterOnController.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
angular.module('application', ['ui.scroll', 'ui.scroll.jqlite'])
1+
angular.module('application', ['ui.scroll'])
22
.controller('mainController', [
33
'$scope', '$log', '$timeout', function ($scope, console, $timeout) {
44
var datasource = {};

‎demo/animation/animation.html

+20-63
Original file line numberDiff line numberDiff line change
@@ -1,77 +1,34 @@
11
<!doctype html>
2-
<html ng-app="application">
2+
<html>
33
<head>
4-
<meta charset="utf-8">
5-
<title>Scroller Demo (animation)</title>
6-
4+
<meta charset="utf-8">
5+
<title>Scroller Demo (animation)</title>
76
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.14/angular.js"></script>
87
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.14/angular-animate.js"></script>
98
<script src="../../dist/ui-scroll.js"></script>
10-
<script src="../../dist/ui-scroll-jqlite.js"></script>
11-
12-
13-
14-
<script src="animation.js"></script>
9+
<script src="animation.js"></script>
1510
<link rel="stylesheet" href="../css/style.css" type="text/css"/>
16-
1711
</head>
1812
<body ng-controller="mainController" ng-app="application">
13+
<div class="cont cont-global">
14+
<a class="back" href="../index.html">browse other examples</a>
15+
<h1 class="page-header page-header-exapmle">Animation demo</h1>
16+
17+
<div class="actions">
18+
<button class="btn btn-default" ng-click="updateList()">update this list</button>
19+
<button class="btn btn-default" ng-click="addToList()">add new 3d item</button>
20+
<button class="btn btn-default" ng-click="removeFromList()">remove even items</button>
21+
<button class="btn btn-default" ng-click="refresh()">refresh</button>
22+
</div>
1923

20-
<!--
21-
<h2>
22-
Animation demo
23-
</h2>
24-
25-
<table>
26-
<tr>
27-
<td>
28-
<div ui-scroll-viewport class="viewport">
29-
<div ui-scroll="item in datasource" class="item"
30-
adapter="adapterContainer.adapter"
31-
buffer-size="5"
32-
is-loading="my.trololo.isLoading">
33-
{{$index}}) {{item.content}}
34-
</div>
24+
<div class="viewport viewport-height-fixed" ui-scroll-viewport id="viewport-animation">
25+
<div ui-scroll="item in datasource" class="item"
26+
adapter="adapterContainer.adapter"
27+
buffer-size="5"
28+
is-loading="my.trololo.isLoading">
29+
{{$index}}) {{item.content}}
3530
</div>
36-
<button ng-click="updateList()">update this list</button>
37-
<button ng-click="addToList()">add new 3d item</button>
38-
<button ng-click="removeFromList()">remove even items</button>
39-
<button ng-click="refresh()">refresh</button>
40-
</td>
41-
</tr>
42-
</table>
43-
-->
44-
45-
46-
47-
48-
49-
50-
51-
52-
<div class="cont cont-global">
53-
<a class="back" href="../index.html">browse other examples</a>
54-
<h1 class="page-header page-header-exapmle">Animation demo</h1>
55-
56-
<div class="actions">
57-
<button class="btn btn-default" ng-click="updateList()">update this list</button>
58-
<button class="btn btn-default" ng-click="addToList()">add new 3d item</button>
59-
<button class="btn btn-default" ng-click="removeFromList()">remove even items</button>
60-
<button class="btn btn-default" ng-click="refresh()">refresh</button>
61-
</div>
62-
63-
64-
65-
<div class="viewport viewport-height-fixed" ui-scroll-viewport id="viewport-animation">
66-
<div ui-scroll="item in datasource" class="item"
67-
adapter="adapterContainer.adapter"
68-
buffer-size="5"
69-
is-loading="my.trololo.isLoading">
70-
{{$index}}) {{item.content}}
7131
</div>
7232
</div>
73-
74-
</div>
75-
7633
</body>
7734
</html>

‎demo/animation/animation.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
angular.module('application', ['ui.scroll', 'ui.scroll.jqlite', 'ngAnimate']).controller('mainController', [
1+
angular.module('application', ['ui.scroll', 'ngAnimate']).controller('mainController', [
22
'$scope', '$log', '$timeout', function($scope, console, $timeout) {
33
var datasource, idList;
44
datasource = {};

‎demo/append/append.html

-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
<title>Append and prepend</title>
66
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.14/angular.js"></script>
77
<script src="../../dist/ui-scroll.js"></script>
8-
<script src="../../dist/ui-scroll-jqlite.js"></script>
98
<script src="append.js"></script>
109
<link rel="stylesheet" href="../css/style.css" type="text/css"/>
1110
</head>
@@ -59,6 +58,5 @@ <h1 class="page-header page-header-exapmle">Append and prepend demo</h1>
5958
</ul>
6059

6160
</div>
62-
6361
</body>
6462
</html>

‎demo/append/append.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
var app = angular.module('application', ['ui.scroll', 'ui.scroll.jqlite']);
1+
var app = angular.module('application', ['ui.scroll']);
22

33
app.factory('Server', [
44
'$timeout', '$q', function ($timeout, $q) {

‎demo/cache/cache.html

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
<!doctype html>
2-
<html ng-app="application">
2+
<html>
33
<head>
44
<meta charset="utf-8">
55
<title>Scroller Demo (cache option) </title>
66
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.14/angular.js"></script>
77
<script src="../../dist/ui-scroll.js"></script>
8-
<script src="../../dist/ui-scroll-jqlite.js"></script>
98
<script src="cache.js"></script>
109
<link rel="stylesheet" href="../css/style.css" type="text/css"/>
1110
</head>

‎demo/cache/cache.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
angular.module('application', ['ui.scroll', 'ui.scroll.jqlite']).controller('mainController', [
1+
angular.module('application', ['ui.scroll']).controller('mainController', [
22
'$scope', '$log', '$timeout', function($scope, console, $timeout) {
33

44
var datasource = {};

‎demo/chat/chat.html

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
<title>Chat demo</title>
66
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.14/angular.js"></script>
77
<script src="../../dist/ui-scroll.js"></script>
8-
<script src="../../dist/ui-scroll-jqlite.js"></script>
98
<script src="chat.js"></script>
109
<link rel="stylesheet" href="../css/style.css" type="text/css"/>
1110
</head>

‎demo/chat/chat.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
var app = angular.module('application', ['ui.scroll', 'ui.scroll.jqlite']);
1+
var app = angular.module('application', ['ui.scroll']);
22

33
app.factory('Server', [
44
'$timeout', '$q', function ($timeout, $q) {

‎demo/controllerAs/controllerAs.html

+7-9
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
11
<!doctype html>
2-
<html ng-app="application">
2+
<html>
33
<head>
4-
<meta charset="utf-8">
5-
<title>Scroller Demo (controller as)</title>
4+
<meta charset="utf-8">
5+
<title>Scroller Demo (controller as)</title>
66
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.14/angular.js"></script>
77
<script src="../../dist/ui-scroll.js"></script>
8-
<script src="../../dist/ui-scroll-jqlite.js"></script>
9-
<script src="controllerAs.js"></script>
8+
<script src="controllerAs.js"></script>
109
<link rel="stylesheet" href="../css/style.css" type="text/css"/>
11-
12-
1310
</head>
1411
<body ng-app="application">
1512

@@ -41,8 +38,9 @@ <h1 class="page-header page-header-exapmle">Controller as syntax for the Datasou
4138
<div ng-if="show">
4239
<div ui-scroll-viewport class="viewport viewport-height-fixed" id="viewport-adapter1">
4340
<div class="item" ui-scroll="item in mainCtrl.datasource"
44-
adapter="mainCtrl.adapter"
45-
buffer-size='5'>{{item.content}}</div>
41+
adapter="mainCtrl.adapter"
42+
buffer-size='5'>{{item.content}}
43+
</div>
4644
</div>
4745
</div>
4846
</div>

‎demo/controllerAs/controllerAs.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
angular.module('application', ['ui.scroll', 'ui.scroll.jqlite']).controller('mainController', [
1+
angular.module('application', ['ui.scroll']).controller('mainController', [
22
'$timeout', function($timeout) {
33

44
var datasource = {};

‎demo/differentItemHeights/differentItemHeights.html

-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
<title>Different Item Heights</title>
66
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.14/angular.js"></script>
77
<script src="../../src/ui-scroll.js"></script>
8-
<script src="../../src/ui-scroll-jqlite.js"></script>
98
<script src="differentItemHeights.js"></script>
109
<link rel="stylesheet" href="../css/style.css" type="text/css"/>
1110
</head>
@@ -25,6 +24,5 @@ <h1 class="page-header page-header-exapmle">Different Item Heights</h1>
2524
</div>
2625

2726
</div>
28-
2927
</body>
3028
</html>

‎demo/differentItemHeights/differentItemHeights.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
angular.module('application', ['ui.scroll', 'ui.scroll.jqlite']).factory('datasource', [
1+
angular.module('application', ['ui.scroll']).factory('datasource', [
22
'$log', '$timeout', function(console, $timeout) {
33
var get, max, min;
44
min = -50;

‎demo/disabled/disabled.html

-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
<title>Disabling</title>
66
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.14/angular.js"></script>
77
<script src="../../dist/ui-scroll.js"></script>
8-
<script src="../../dist/ui-scroll-jqlite.js"></script>
98
<script src="disabled.js"></script>
109
<link rel="stylesheet" href="../css/style.css" type="text/css"/>
1110
</head>
@@ -41,6 +40,5 @@ <h1 class="page-header page-header-exapmle">Disabled attribute</h1>
4140
</div>
4241

4342
</div>
44-
4543
</body>
4644
</html>

‎demo/disabled/disabled.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
angular.module('application', ['ui.scroll', 'ui.scroll.jqlite'])
1+
angular.module('application', ['ui.scroll'])
22
.controller('mainController', [
33
'$scope', '$log', '$timeout', function ($scope, console, $timeout) {
44
var datasource = {};

0 commit comments

Comments
 (0)