Skip to content

Commit bad9a73

Browse files
committed
Merge branch 'master' of github.com:angular-ui/ui-scroll
2 parents 4107d4b + 3bad515 commit bad9a73

11 files changed

+56
-35
lines changed

demo/multipleReloadTest/multipleReload.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<meta charset="utf-8">
55
<title>Multiple reload test</title>
66
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.14/angular.js"></script>
7-
<script src="../../src/ui-scroll.js"></script>
7+
<script src="../../dist/ui-scroll.js"></script>
88
<script src="multipleReload.js"></script>
99
<link rel="stylesheet" href="../css/style.css" type="text/css"/>
1010
</head>
@@ -17,12 +17,12 @@
1717
<h1 class="page-header page-header-exapmle">Multiple reload test</h1>
1818

1919
<div class="actions">
20-
<button ng-click="doSingleReload()"> Do single reload</button>
20+
<button ng-click="show = !show"> Do single reload</button>
2121
<button ng-click="doMultipleReload()"> Do multiple reload</button>
2222
Loading: {{adapter.isLoading}}
2323
</div>
2424

25-
<div class="viewport" id="viewport-scopeDatasource" ui-scroll-viewport>
25+
<div class="viewport" id="viewport-scopeDatasource" ui-scroll-viewport ng-if="show">
2626
<div class="item" ui-scroll="item in datasource" adapter="adapter">{{item}}</div>
2727
</div>
2828

dist/ui-scroll-grid.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/ui-scroll-grid.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/ui-scroll-grid.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/ui-scroll-grid.min.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/ui-scroll.js

+23-11
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/ui-scroll.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/ui-scroll.min.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/ui-scroll.min.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/modules/elementRoutines.js

+18-10
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,29 @@
11
const hideClassToken = 'ng-ui-scroll-hide';
22

3-
function addCSSRule(sheet, selector, rules, index) {
4-
if('insertRule' in sheet) {
5-
sheet.insertRule(selector + '{' + rules + '}', index);
6-
}
7-
else if('addRule' in sheet) {
8-
sheet.addRule(selector, rules, index);
9-
}
10-
}
11-
123
export default class ElementRoutines {
134

5+
static addCSSRules() {
6+
const selector = '.' + hideClassToken;
7+
const rules = 'display: none';
8+
const sheet = document.styleSheets[0];
9+
let index;
10+
try {
11+
index = sheet.cssRules.length;
12+
} catch (err) {
13+
index = 0;
14+
}
15+
if('insertRule' in sheet) {
16+
sheet.insertRule(selector + '{' + rules + '}', index);
17+
}
18+
else if('addRule' in sheet) {
19+
sheet.addRule(selector, rules, index);
20+
}
21+
}
22+
1423
constructor($injector, $q) {
1524
this.$animate = ($injector.has && $injector.has('$animate')) ? $injector.get('$animate') : null;
1625
this.isAngularVersionLessThen1_3 = angular.version.major === 1 && angular.version.minor < 3;
1726
this.$q = $q;
18-
addCSSRule(document.styleSheets[0], '.' + hideClassToken, 'display: none');
1927
}
2028

2129
hideElement(wrapper) {

src/ui-scroll.js

+4-3
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@ import Adapter from './modules/adapter.js';
77
angular.module('ui.scroll', [])
88

99
.constant('JQLiteExtras', JQLiteExtras)
10-
.run(['JQLiteExtras', (JQLiteExtras) =>
11-
!window.jQuery ? (new JQLiteExtras()).registerFor(angular.element) : null
12-
])
10+
.run(['JQLiteExtras', (JQLiteExtras) => {
11+
!window.jQuery ? (new JQLiteExtras()).registerFor(angular.element) : null;
12+
ElementRoutines.addCSSRules();
13+
}])
1314

1415
.directive('uiScrollViewport', function () {
1516
return {

0 commit comments

Comments
 (0)