Skip to content

jqLiteExtras refactoring #129

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,7 @@ module.exports = function (grunt) {
dynamic_mappings: {
files: {
'dist/ui-scroll.js': ['./temp/**/ui-scroll.js'],
'dist/ui-scroll-grid.js': ['./temp/**/ui-scroll-grid.js'],
'dist/ui-scroll-jqlite.js': ['./temp/**/ui-scroll-jqlite.js']
'dist/ui-scroll-grid.js': ['./temp/**/ui-scroll-grid.js']
}
}
},
Expand All @@ -110,17 +109,15 @@ module.exports = function (grunt) {
common: {
files: {
'./dist/ui-scroll.min.js': ['./dist/ui-scroll.js'],
'./dist/ui-scroll-grid.min.js': ['./dist/ui-scroll-grid.js'],
'./dist/ui-scroll-jqlite.min.js': ['./dist/ui-scroll-jqlite.js']
'./dist/ui-scroll-grid.min.js': ['./dist/ui-scroll-grid.js']
}
}
},
jshint: {
dist: {
files: {
src: [
'./dist/ui-scroll.js',
'./dist/ui-scroll-jqlite.js'
'./dist/ui-scroll.js'
]
},
options: {
Expand All @@ -130,8 +127,7 @@ module.exports = function (grunt) {
src: {
files: {
src: [
'./src/ui-scroll.js',
'./src/ui-scroll-jqlite.js'
'./src/ui-scroll.js'
]
},
options: grunt.util._.extend({}, grunt.file.readJSON('.jshintrc'), grunt.file.readJSON('./src/.jshintrc'))
Expand Down
13 changes: 3 additions & 10 deletions demo/adapter/adapter.html
Original file line number Diff line number Diff line change
@@ -1,22 +1,15 @@
<!doctype html>
<html ng-app="application">
<html>
<head>
<meta charset="utf-8">
<title>Scroller Demo (adapter)</title>
<title>Adapter demo</title>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.14/angular.js"></script>
<script src="../../dist/ui-scroll.js"></script>
<script src="../../dist/ui-scroll-jqlite.js"></script>
<script src="../../src/ui-scroll.js"></script>
<script src="adapter.js"></script>
<link rel="stylesheet" href="../css/style.css" type="text/css"/>


</head>
<body ng-controller="mainController" ng-app="application">





<div class="cont cont-global">
<a class="back" href="../index.html">browse other examples</a>
<h1 class="page-header page-header-exapmle">Adapter (updatable scroller)</h1>
Expand Down
2 changes: 1 addition & 1 deletion demo/adapter/adapter.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
angular.module('application', ['ui.scroll', 'ui.scroll.jqlite']).controller('mainController', [
angular.module('application', ['ui.scroll']).controller('mainController', [
'$scope', '$log', '$timeout', function($scope, console, $timeout) {
var datasource, idList1, idList2;
datasource = {};
Expand Down
1 change: 0 additions & 1 deletion demo/adapterOnController/adapterOnController.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<title>Adapter On Controller</title>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.14/angular.js"></script>
<script src="../../dist/ui-scroll.js"></script>
<script src="../../dist/ui-scroll-jqlite.js"></script>
<script src="adapterOnController.js"></script>
<link rel="stylesheet" href="../css/style.css" type="text/css"/>
</head>
Expand Down
2 changes: 1 addition & 1 deletion demo/adapterOnController/adapterOnController.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
angular.module('application', ['ui.scroll', 'ui.scroll.jqlite'])
angular.module('application', ['ui.scroll'])
.controller('mainController', [
'$scope', '$log', '$timeout', function ($scope, console, $timeout) {
var datasource = {};
Expand Down
16 changes: 2 additions & 14 deletions demo/animation/animation.html
Original file line number Diff line number Diff line change
@@ -1,16 +1,11 @@
<!doctype html>
<html ng-app="application">
<html>
<head>
<meta charset="utf-8">
<title>Scroller Demo (animation)</title>

<title>Animation demo</title>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.14/angular.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.14/angular-animate.js"></script>
<script src="../../dist/ui-scroll.js"></script>
<script src="../../dist/ui-scroll-jqlite.js"></script>



<script src="animation.js"></script>
<link rel="stylesheet" href="../css/style.css" type="text/css"/>

Expand Down Expand Up @@ -42,13 +37,6 @@ <h2>
</table>
-->








<div class="cont cont-global">
<a class="back" href="../index.html">browse other examples</a>
<h1 class="page-header page-header-exapmle">Animation demo</h1>
Expand Down
2 changes: 1 addition & 1 deletion demo/animation/animation.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
angular.module('application', ['ui.scroll', 'ui.scroll.jqlite', 'ngAnimate']).controller('mainController', [
angular.module('application', ['ui.scroll', 'ngAnimate']).controller('mainController', [
'$scope', '$log', '$timeout', function($scope, console, $timeout) {
var datasource, idList;
datasource = {};
Expand Down
4 changes: 1 addition & 3 deletions demo/append/append.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<title>Append and prepend</title>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.14/angular.js"></script>
<script src="../../dist/ui-scroll.js"></script>
<script src="../../dist/ui-scroll-jqlite.js"></script>
<script src="append.js"></script>
<link rel="stylesheet" href="../css/style.css" type="text/css"/>
</head>
Expand All @@ -28,8 +27,7 @@ <h1 class="page-header page-header-exapmle">Append and prepend demo</h1>
<em>appendItem(params)</em> to add one new item (based on params) to the end of the remote data set,
</li>
<li>
<em>prependItem(params)</em> to add one new item (based on params) in the beginning of the remote data
set,
<em>prependItem(params)</em> to add one new item (based on params) in the beginning of the remote data set,
</li>
<li>
<em>request(index, count)</em> just to fetch a bunch of items for the viewport.
Expand Down
2 changes: 1 addition & 1 deletion demo/append/append.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
var app = angular.module('application', ['ui.scroll', 'ui.scroll.jqlite']);
var app = angular.module('application', ['ui.scroll']);

app.factory('Server', [
'$timeout', '$q', function ($timeout, $q) {
Expand Down
1 change: 0 additions & 1 deletion demo/cache/cache.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<title>Scroller Demo (cache option) </title>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.14/angular.js"></script>
<script src="../../dist/ui-scroll.js"></script>
<script src="../../dist/ui-scroll-jqlite.js"></script>
<script src="cache.js"></script>
<link rel="stylesheet" href="../css/style.css" type="text/css"/>
</head>
Expand Down
2 changes: 1 addition & 1 deletion demo/cache/cache.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
angular.module('application', ['ui.scroll', 'ui.scroll.jqlite']).controller('mainController', [
angular.module('application', ['ui.scroll']).controller('mainController', [
'$scope', '$log', '$timeout', function($scope, console, $timeout) {

var datasource = {};
Expand Down
1 change: 0 additions & 1 deletion demo/chat/chat.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<title>Chat demo</title>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.14/angular.js"></script>
<script src="../../dist/ui-scroll.js"></script>
<script src="../../dist/ui-scroll-jqlite.js"></script>
<script src="chat.js"></script>
<link rel="stylesheet" href="../css/style.css" type="text/css"/>
</head>
Expand Down
2 changes: 1 addition & 1 deletion demo/chat/chat.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
var app = angular.module('application', ['ui.scroll', 'ui.scroll.jqlite']);
var app = angular.module('application', ['ui.scroll']);

app.factory('Server', [
'$timeout', '$q', function ($timeout, $q) {
Expand Down
7 changes: 2 additions & 5 deletions demo/controllerAs/controllerAs.html
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
<!doctype html>
<html ng-app="application">
<html>
<head>
<meta charset="utf-8">
<title>Scroller Demo (controller as)</title>
<title>Controller as syntax</title>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.14/angular.js"></script>
<script src="../../dist/ui-scroll.js"></script>
<script src="../../dist/ui-scroll-jqlite.js"></script>
<script src="controllerAs.js"></script>
<link rel="stylesheet" href="../css/style.css" type="text/css"/>


</head>
<body ng-app="application">

Expand Down
2 changes: 1 addition & 1 deletion demo/controllerAs/controllerAs.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
angular.module('application', ['ui.scroll', 'ui.scroll.jqlite']).controller('mainController', [
angular.module('application', ['ui.scroll']).controller('mainController', [
'$timeout', function($timeout) {

var datasource = {};
Expand Down
1 change: 0 additions & 1 deletion demo/differentItemHeights/differentItemHeights.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<title>Different Item Heights</title>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.14/angular.js"></script>
<script src="../../src/ui-scroll.js"></script>
<script src="../../src/ui-scroll-jqlite.js"></script>
<script src="differentItemHeights.js"></script>
<link rel="stylesheet" href="../css/style.css" type="text/css"/>
</head>
Expand Down
2 changes: 1 addition & 1 deletion demo/differentItemHeights/differentItemHeights.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
angular.module('application', ['ui.scroll', 'ui.scroll.jqlite']).factory('datasource', [
angular.module('application', ['ui.scroll']).factory('datasource', [
'$log', '$timeout', function(console, $timeout) {
var get, max, min;
min = -50;
Expand Down
1 change: 0 additions & 1 deletion demo/disabled/disabled.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<title>Disabling</title>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.14/angular.js"></script>
<script src="../../dist/ui-scroll.js"></script>
<script src="../../dist/ui-scroll-jqlite.js"></script>
<script src="disabled.js"></script>
<link rel="stylesheet" href="../css/style.css" type="text/css"/>
</head>
Expand Down
2 changes: 1 addition & 1 deletion demo/disabled/disabled.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
angular.module('application', ['ui.scroll', 'ui.scroll.jqlite'])
angular.module('application', ['ui.scroll'])
.controller('mainController', [
'$scope', '$log', '$timeout', function ($scope, console, $timeout) {
var datasource = {};
Expand Down
1 change: 0 additions & 1 deletion demo/grid-dnd-sort-2/grid-dnd-sort.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
<script src="./angular-dnd.js"></script>
<script src="../../dist/ui-scroll.js"></script>
<script src="../../dist/ui-scroll-grid.js"></script>
<script src="../../dist/ui-scroll-jqlite.js"></script>
<script src="grid-dnd-sort.js"></script>
<link rel="stylesheet" href="../css/style.css" type="text/css"/>
<link rel="stylesheet" href="grid.css" type="text/css"/>
Expand Down
2 changes: 1 addition & 1 deletion demo/grid-dnd-sort-2/grid-dnd-sort.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
angular.module('application', ['ui.scroll', 'ui.scroll.jqlite', 'ui.scroll.grid', 'dnd'])
angular.module('application', ['ui.scroll', 'ui.scroll.grid', 'dnd'])
.controller('gridController', [
'$scope', '$log', '$timeout', function ($scope, console, $timeout) {
var datasource = {};
Expand Down
1 change: 0 additions & 1 deletion demo/grid-dnd-sort/grid-dnd-sort.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.14/angular.js"></script>
<script src="../../dist/ui-scroll.js"></script>
<script src="../../dist/ui-scroll-grid.js"></script>
<script src="../../dist/ui-scroll-jqlite.js"></script>
<script src="grid-dnd-sort.js"></script>
<link rel="stylesheet" href="../css/style.css" type="text/css"/>
<link rel="stylesheet" href="grid.css" type="text/css"/>
Expand Down
2 changes: 1 addition & 1 deletion demo/grid-dnd-sort/grid-dnd-sort.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
angular.module('application', ['ui.scroll', 'ui.scroll.jqlite', 'ui.scroll.grid'])
angular.module('application', ['ui.scroll', 'ui.scroll.grid'])
.controller('gridController', [
'$scope', '$log', '$timeout', function ($scope, console, $timeout) {
var datasource = {};
Expand Down
1 change: 0 additions & 1 deletion demo/grid-dnd-widths/grid-dnd-widths.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.14/angular.js"></script>
<script src="../../dist/ui-scroll.js"></script>
<script src="../../dist/ui-scroll-grid.js"></script>
<script src="../../dist/ui-scroll-jqlite.js"></script>
<script src="grid-dnd-widths.js"></script>
<link rel="stylesheet" type="text/css" href="../css/style.css"/>
<link rel="stylesheet" type="text/css" href="grid.css"/>
Expand Down
2 changes: 1 addition & 1 deletion demo/grid-dnd-widths/grid-dnd-widths.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
angular.module('application', ['ui.scroll', 'ui.scroll.jqlite', 'ui.scroll.grid'])
angular.module('application', ['ui.scroll', 'ui.scroll.grid'])
.controller('gridController', [
'$scope', '$log', '$timeout', function ($scope, console, $timeout) {
var datasource = {};
Expand Down
1 change: 0 additions & 1 deletion demo/grid-layout-apply/grid-layout-apply.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.14/angular.js"></script>
<script src="../../dist/ui-scroll.js"></script>
<script src="../../dist/ui-scroll-grid.js"></script>
<script src="../../dist/ui-scroll-jqlite.js"></script>
<script src="grid-layout-apply.js"></script>
<link rel="stylesheet" href="../css/style.css" type="text/css"/>
<link rel="stylesheet" href="grid.css" type="text/css"/>
Expand Down
2 changes: 1 addition & 1 deletion demo/grid-layout-apply/grid-layout-apply.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
angular.module('application', ['ui.scroll', 'ui.scroll.jqlite', 'ui.scroll.grid'])
angular.module('application', ['ui.scroll', 'ui.scroll.grid'])
.controller('gridController', [
'$scope', '$log', '$timeout', function ($scope, console, $timeout) {
var datasource = {};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.14/angular.js"></script>
<script src="../../dist/ui-scroll.js"></script>
<script src="../../dist/ui-scroll-grid.js"></script>
<script src="../../dist/ui-scroll-jqlite.js"></script>
<script src="grid-layout-manipulations.js"></script>
<link rel="stylesheet" href="../css/style.css" type="text/css"/>
<link rel="stylesheet" href="grid.css" type="text/css"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
angular.module('application', ['ui.scroll', 'ui.scroll.jqlite', 'ui.scroll.grid'])
angular.module('application', ['ui.scroll', 'ui.scroll.grid'])
.controller('gridController', [
'$scope', '$log', '$timeout', function ($scope, console, $timeout) {
var datasource = {};
Expand Down
1 change: 0 additions & 1 deletion demo/insideComponent/insideComponent.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<title>Inside es6 component</title>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.7/angular.js"></script>
<script src="../../dist/ui-scroll.js"></script>
<script src="../../dist/ui-scroll-jqlite.js"></script>
<script src="insideComponent.js"></script>
<link rel="stylesheet" href="../css/style.css" type="text/css"/>
</head>
Expand Down
2 changes: 1 addition & 1 deletion demo/insideComponent/insideComponent.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
}

angular
.module('application', ['ui.scroll', 'ui.scroll.jqlite'])
.module('application', ['ui.scroll'])
.component('myComponent', {
controllerAs: 'ctrl',
template:
Expand Down
1 change: 0 additions & 1 deletion demo/insideDirective/insideDirective.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<title>Inside directive</title>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.7/angular.js"></script>
<script src="../../dist/ui-scroll.js"></script>
<script src="../../dist/ui-scroll-jqlite.js"></script>
<script src="insideDirective.js"></script>
<link rel="stylesheet" href="../css/style.css" type="text/css"/>
</head>
Expand Down
2 changes: 1 addition & 1 deletion demo/insideDirective/insideDirective.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
angular.module('application', ['ui.scroll', 'ui.scroll.jqlite'])
angular.module('application', ['ui.scroll'])
.controller('mainController', ['$scope', function($scope) {
$scope.show = true;
}])
Expand Down
1 change: 0 additions & 1 deletion demo/isLoading/isLoading.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<title>Is loading</title>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.1/angular.js"></script>
<script src="../../dist/ui-scroll.js"></script>
<script src="../../dist/ui-scroll-jqlite.js"></script>
<script src="isLoading.js"></script>
<link rel="stylesheet" href="../css/style.css" type="text/css"/>
</head>
Expand Down
2 changes: 1 addition & 1 deletion demo/isLoading/isLoading.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
angular.module('application', ['ui.scroll', 'ui.scroll.jqlite'])
angular.module('application', ['ui.scroll'])
.factory('datasource', ['$log', '$timeout',
function (console, $timeout) {

Expand Down
1 change: 0 additions & 1 deletion demo/isLoading/isLoadingAdapter.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<title>Is loading (Adapter)</title>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.1/angular.js"></script>
<script src="../../dist/ui-scroll.js"></script>
<script src="../../dist/ui-scroll-jqlite.js"></script>
<script src="isLoadingAdapter.js"></script>
<link rel="stylesheet" href="../css/style.css" type="text/css"/>
</head>
Expand Down
2 changes: 1 addition & 1 deletion demo/isLoading/isLoadingAdapter.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
angular.module('application', ['ui.scroll', 'ui.scroll.jqlite'])
angular.module('application', ['ui.scroll'])
.controller('mainController', [
'$scope', '$log', '$timeout', function ($scope, console, $timeout) {

Expand Down
1 change: 0 additions & 1 deletion demo/listScroller/listScroller.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<title>li based scrollable list</title>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.1/angular.js"></script>
<script src="../../dist/ui-scroll.js"></script>
<script src="../../dist/ui-scroll-jqlite.js"></script>
<script src="listScroller.js"></script>
<link rel="stylesheet" href="../css/style.css" type="text/css"/>
</head>
Expand Down
2 changes: 1 addition & 1 deletion demo/listScroller/listScroller.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
angular.module('application', ['ui.scroll', 'ui.scroll.jqlite'])
angular.module('application', ['ui.scroll'])
.factory('datasource', ['$log', '$timeout',
function (console, $timeout) {

Expand Down
1 change: 0 additions & 1 deletion demo/multipleLists/multipleLists.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<title>Independent scrollable lists</title>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.14/angular.js"></script>
<script src="../../dist/ui-scroll.js"></script>
<script src="../../dist/ui-scroll-jqlite.js"></script>
<script src="multipleLists.js"></script>
<link rel="stylesheet" href="../css/style.css" type="text/css"/>
</head>
Expand Down
2 changes: 1 addition & 1 deletion demo/multipleLists/multipleLists.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
angular.module('application', ['ui.scroll', 'ui.scroll.jqlite'])
angular.module('application', ['ui.scroll'])
.controller('mainController', [
'$scope', '$log', '$timeout', function ($scope, console, $timeout) {
var datasource = {};
Expand Down
1 change: 0 additions & 1 deletion demo/multipleReloadTest/multipleReload.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<title>Multiple reload test</title>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.14/angular.js"></script>
<script src="../../src/ui-scroll.js"></script>
<script src="../../src/ui-scroll-jqlite.js"></script>
<script src="multipleReload.js"></script>
<link rel="stylesheet" href="../css/style.css" type="text/css"/>
</head>
Expand Down
2 changes: 1 addition & 1 deletion demo/multipleReloadTest/multipleReload.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
angular.module('application', ['ui.scroll', 'ui.scroll.jqlite'])
angular.module('application', ['ui.scroll'])
.controller('mainController', [
'$scope', '$log', '$timeout', function ($scope, console, $timeout) {
var datasource = {};
Expand Down
Loading