Skip to content

Commit b72ae61

Browse files
mchapmanmchapman
committed
chore(build)
1 parent cf2bc2d commit b72ae61

7 files changed

+30
-37
lines changed

‎dist/forms-angular-with-bs2.css

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5271,9 +5271,11 @@ a.badge:focus {
52715271
padding-left: 20px;
52725272
}
52735273
.header-rhs {
5274-
width: 226px;
5275-
padding-right: 60px;
5274+
min-width: 226px;
52765275
min-height: 40px;
5276+
padding-right: 20px;
5277+
padding-bottom: 5px;
5278+
display: block;
52775279
}
52785280
.list-header .header-rhs {
52795281
margin: 15px 0;
@@ -5284,12 +5286,6 @@ a.badge:focus {
52845286
margin-top: 11px;
52855287
z-index: 1;
52865288
}
5287-
.header-rhs {
5288-
width: inherited !important;
5289-
padding-right: 20px !important;
5290-
padding-bottom: 5px;
5291-
display: block;
5292-
}
52935289
.gridStyle {
52945290
border: 1px solid #d4d4d4;
52955291
margin: auto;

‎dist/forms-angular-with-bs2.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/forms-angular-with-bs3.css

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5817,9 +5817,11 @@ button.close {
58175817
padding-left: 20px;
58185818
}
58195819
.header-rhs {
5820-
width: 226px;
5821-
padding-right: 60px;
5820+
min-width: 226px;
58225821
min-height: 40px;
5822+
padding-right: 20px;
5823+
padding-bottom: 5px;
5824+
display: block;
58235825
}
58245826
.list-header .header-rhs {
58255827
margin: 15px 0;
@@ -5830,12 +5832,6 @@ button.close {
58305832
margin-top: 11px;
58315833
z-index: 1;
58325834
}
5833-
.header-rhs {
5834-
width: inherited !important;
5835-
padding-right: 20px !important;
5836-
padding-bottom: 5px;
5837-
display: block;
5838-
}
58395835
.gridStyle {
58405836
border: 1px solid #d4d4d4;
58415837
margin: auto;

‎dist/forms-angular-with-bs3.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/forms-angular.js

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*! forms-angular 2015-02-24 */
1+
/*! forms-angular 2015-02-26 */
22
'use strict';
33

44
var formsAngular = angular.module('formsAngular', [
@@ -2044,7 +2044,7 @@ formsAngular.factory('formGenerator', function (
20442044
};
20452045

20462046
$scope.skipCols = function (index) {
2047-
return index > 0 ? 'col-md-offset-2' : '';
2047+
return index > 0 ? 'col-md-offset-3' : '';
20482048
};
20492049

20502050
$scope.setFormDirty = function (event) {
@@ -2197,7 +2197,7 @@ formsAngular.factory('formMarkupHelper', [
21972197
// Override default label class (can be empty)
21982198
classes += ' ' + fieldInfo.labelDefaultClass;
21992199
} else if (cssFrameworkService.framework() === 'bs3') {
2200-
classes += ' col-sm-2';
2200+
classes += ' col-sm-3';
22012201
}
22022202
} else if (options.formstyle === 'inline') {
22032203
labelHTML += ' for="' + fieldInfo.id + '"';
@@ -2277,7 +2277,7 @@ formsAngular.factory('formMarkupHelper', [
22772277
exports.controlDivClasses = function (options) {
22782278
var result = [];
22792279
if (exports.isHorizontalStyle(options.formstyle)) {
2280-
result.push(cssFrameworkService.framework() === 'bs2' ? 'controls' : 'col-sm-10');
2280+
result.push(cssFrameworkService.framework() === 'bs2' ? 'controls' : 'col-sm-9');
22812281
}
22822282
return result;
22832283
};
@@ -2474,19 +2474,24 @@ formsAngular.factory('recordHandler', function (
24742474
}).error(handleError);
24752475
};
24762476

2477-
// FIXME: this method seems to be not used anymore
24782477
exports.scrollTheList = function ($scope, handleError) {
2478+
var pagesLoaded = $scope.pagesLoaded;
24792479
SubmissionsService.getPagedAndFilteredList($scope.modelName, {
24802480
aggregate: $location.$$search.a,
24812481
find: $location.$$search.f,
24822482
limit: $scope.pageSize,
2483-
skip: $scope.pagesLoaded * $scope.pageSize,
2483+
skip: pagesLoaded * $scope.pageSize,
24842484
order: $location.$$search.o
24852485
})
24862486
.success(function (data) {
24872487
if (angular.isArray(data)) {
2488-
$scope.pagesLoaded++;
2489-
$scope.recordList = $scope.recordList.concat(data);
2488+
// I have seen an intermittent problem where a page is requested twice
2489+
if (pagesLoaded === $scope.pagesLoaded) {
2490+
$scope.pagesLoaded++;
2491+
$scope.recordList = $scope.recordList.concat(data);
2492+
} else {
2493+
console.log('DEBUG: infinite scroll component asked for a page twice');
2494+
}
24902495
} else {
24912496
$scope.showError(data, 'Invalid query');
24922497
}

‎dist/forms-angular.min.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎less/forms-angular-with-bs3.css

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5817,9 +5817,11 @@ button.close {
58175817
padding-left: 20px;
58185818
}
58195819
.header-rhs {
5820-
width: 226px;
5821-
padding-right: 60px;
5820+
min-width: 226px;
58225821
min-height: 40px;
5822+
padding-right: 20px;
5823+
padding-bottom: 5px;
5824+
display: block;
58235825
}
58245826
.list-header .header-rhs {
58255827
margin: 15px 0;
@@ -5830,12 +5832,6 @@ button.close {
58305832
margin-top: 11px;
58315833
z-index: 1;
58325834
}
5833-
.header-rhs {
5834-
width: inherited !important;
5835-
padding-right: 20px !important;
5836-
padding-bottom: 5px;
5837-
display: block;
5838-
}
58395835
.gridStyle {
58405836
border: 1px solid #d4d4d4;
58415837
margin: auto;

0 commit comments

Comments
 (0)