Skip to content

Commit

Permalink
add more specific term for CSS classes 'enabled' and 'disabled' (#837)
Browse files Browse the repository at this point in the history
  • Loading branch information
@gesinn-it-ilm
gesinn-it-ilm committed Jun 10, 2024
1 parent 5515deb commit 32cf562
Show file tree
Hide file tree
Showing 3 changed files with 53 additions and 53 deletions.
12 changes: 6 additions & 6 deletions formats/filtered/resources/js/ext.srf.filtered.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions formats/filtered/resources/ts/Filtered/Filter/Filter.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ export abstract class Filter{
this.disabled = true;

this.outerTarget
.removeClass( 'enabled' )
.addClass( 'disabled' );
.removeClass( 'filtered-filter-enabled' )
.addClass( 'filtered-filter-disabled' );

this.collapse();

Expand All @@ -43,8 +43,8 @@ export abstract class Filter{
this.disabled = false;

this.outerTarget
.removeClass( 'disabled' )
.addClass( 'enabled' );
.removeClass( 'filtered-filter-disabled' )
.addClass( 'filtered-filter-enabled' );

if ( ! this.collapsed ) {
this.uncollapse();
Expand Down Expand Up @@ -99,7 +99,7 @@ export abstract class Filter{

this.outerTarget
.append( this.target )
.addClass( 'enabled' );
.addClass( 'filtered-filter-enabled' );

this.addOnOffSwitch();
this.addLabel();
Expand Down Expand Up @@ -127,7 +127,7 @@ export abstract class Filter{

onOffControl.click( () => {

if ( this.outerTarget.hasClass('enabled' ) ) {
if ( this.outerTarget.hasClass('filtered-filter-enabled' ) ) {
this.disable();
} else {
this.enable();
Expand Down
82 changes: 41 additions & 41 deletions tests/qunit/formats/ext.srf.formats.filtered.test.js
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
(function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({1:[function(require,module,exports){
(function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({1:[function(require,module,exports){
"use strict";
/// <reference types="jquery" />
exports.__esModule = true;
Expand Down Expand Up @@ -156,8 +156,8 @@ var Controller = /** @class */ (function () {
return Controller;
}());
exports.Controller = Controller;

},{"./View/View":7}],2:[function(require,module,exports){

},{"./View/View":7}],2:[function(require,module,exports){
"use strict";
var __extends = (this && this.__extends) || (function () {
var extendStatics = function (d, b) {
Expand Down Expand Up @@ -281,8 +281,8 @@ var DistanceFilter = /** @class */ (function (_super) {
return DistanceFilter;
}(Filter_1.Filter));
exports.DistanceFilter = DistanceFilter;

},{"./Filter":3}],3:[function(require,module,exports){

},{"./Filter":3}],3:[function(require,module,exports){
"use strict";
exports.__esModule = true;
var Filter = /** @class */ (function () {
Expand All @@ -308,17 +308,17 @@ var Filter = /** @class */ (function () {
var _this = this;
this.disabled = true;
this.outerTarget
.removeClass('enabled')
.addClass('disabled');
.removeClass('filtered-filter-enabled')
.addClass('filtered-filter-disabled');
this.collapse();
this.target.promise().then(function () { return _this.controller.onFilterUpdated(_this.filterId); });
};
Filter.prototype.enable = function () {
var _this = this;
this.disabled = false;
this.outerTarget
.removeClass('disabled')
.addClass('enabled');
.removeClass('filtered-filter-disabled')
.addClass('filtered-filter-enabled');
if (!this.collapsed) {
this.uncollapse();
}
Expand Down Expand Up @@ -361,7 +361,7 @@ var Filter = /** @class */ (function () {
this.target = $('<div class="filtered-filter-container">');
this.outerTarget
.append(this.target)
.addClass('enabled');
.addClass('filtered-filter-enabled');
this.addOnOffSwitch();
this.addLabel();
this.addControlForCollapsing();
Expand All @@ -379,7 +379,7 @@ var Filter = /** @class */ (function () {
var onOffControl = $("<div class=\"filtered-filter-onoff on\"></div>");
this.target.before(onOffControl);
onOffControl.click(function () {
if (_this.outerTarget.hasClass('enabled')) {
if (_this.outerTarget.hasClass('filtered-filter-enabled')) {
_this.disable();
}
else {
Expand Down Expand Up @@ -424,8 +424,8 @@ var Filter = /** @class */ (function () {
return Filter;
}());
exports.Filter = Filter;

},{}],4:[function(require,module,exports){

},{}],4:[function(require,module,exports){
"use strict";
var __extends = (this && this.__extends) || (function () {
var extendStatics = function (d, b) {
Expand Down Expand Up @@ -625,8 +625,8 @@ var ValueFilter = /** @class */ (function (_super) {
return ValueFilter;
}(Filter_1.Filter));
exports.ValueFilter = ValueFilter;

},{"./Filter":3}],5:[function(require,module,exports){

},{"./Filter":3}],5:[function(require,module,exports){
"use strict";
exports.__esModule = true;
var ViewSelector = /** @class */ (function () {
Expand Down Expand Up @@ -657,8 +657,8 @@ var ViewSelector = /** @class */ (function () {
return ViewSelector;
}());
exports.ViewSelector = ViewSelector;

},{}],6:[function(require,module,exports){

},{}],6:[function(require,module,exports){
"use strict";
/// <reference types="leaflet" />
var __extends = (this && this.__extends) || (function () {
Expand Down Expand Up @@ -887,8 +887,8 @@ var MapView = /** @class */ (function (_super) {
return MapView;
}(View_1.View));
exports.MapView = MapView;

},{"./View":7}],7:[function(require,module,exports){

},{"./View":7}],7:[function(require,module,exports){
"use strict";
exports.__esModule = true;
var View = /** @class */ (function () {
Expand Down Expand Up @@ -961,8 +961,8 @@ var View = /** @class */ (function () {
return View;
}());
exports.View = View;

},{}],8:[function(require,module,exports){

},{}],8:[function(require,module,exports){
"use strict";
/// <reference types="qunit" />
exports.__esModule = true;
Expand Down Expand Up @@ -1099,8 +1099,8 @@ var ControllerTest = /** @class */ (function () {
return ControllerTest;
}());
exports.ControllerTest = ControllerTest;

},{"../../../resources/ts/Filtered/Controller":1,"../../../resources/ts/Filtered/View/View":7,"../Util/MockedFilter":14}],9:[function(require,module,exports){

},{"../../../resources/ts/Filtered/Controller":1,"../../../resources/ts/Filtered/View/View":7,"../Util/MockedFilter":14}],9:[function(require,module,exports){
"use strict";
/// <reference types="qunit" />
/// <reference types="jquery" />
Expand Down Expand Up @@ -1153,8 +1153,8 @@ var DistanceFilterTest = /** @class */ (function (_super) {
return DistanceFilterTest;
}(QUnitTest_1.QUnitTest));
exports.DistanceFilterTest = DistanceFilterTest;

},{"../../../../resources/ts/Filtered/Controller":1,"../../../../resources/ts/Filtered/Filter/DistanceFilter":2,"../../Util/QUnitTest":15}],10:[function(require,module,exports){

},{"../../../../resources/ts/Filtered/Controller":1,"../../../../resources/ts/Filtered/Filter/DistanceFilter":2,"../../Util/QUnitTest":15}],10:[function(require,module,exports){
"use strict";
/// <reference types="qunit" />
/// <reference types="jquery" />
Expand Down Expand Up @@ -1249,8 +1249,8 @@ var ValueFilterTest = /** @class */ (function (_super) {
return ValueFilterTest;
}(QUnitTest_1.QUnitTest));
exports.ValueFilterTest = ValueFilterTest;

},{"../../../../resources/ts/Filtered/Controller":1,"../../../../resources/ts/Filtered/Filter/ValueFilter":4,"../../Util/QUnitTest":15}],11:[function(require,module,exports){

},{"../../../../resources/ts/Filtered/Controller":1,"../../../../resources/ts/Filtered/Filter/ValueFilter":4,"../../Util/QUnitTest":15}],11:[function(require,module,exports){
"use strict";
/// <reference types="qunit" />
/// <reference types="jquery" />
Expand Down Expand Up @@ -1357,8 +1357,8 @@ var ViewSelectorTest = /** @class */ (function () {
return ViewSelectorTest;
}());
exports.ViewSelectorTest = ViewSelectorTest;

},{"../../../resources/ts/Filtered/Controller":1,"../../../resources/ts/Filtered/ViewSelector":5}],12:[function(require,module,exports){

},{"../../../resources/ts/Filtered/Controller":1,"../../../resources/ts/Filtered/ViewSelector":5}],12:[function(require,module,exports){
"use strict";
/// <reference types="qunit" />
/// <reference types="jquery" />
Expand Down Expand Up @@ -1402,8 +1402,8 @@ var MapViewTest = /** @class */ (function (_super) {
return MapViewTest;
}(ViewTest_1.ViewTest));
exports.MapViewTest = MapViewTest;

},{"../../../../resources/ts/Filtered/Controller":1,"../../../../resources/ts/Filtered/View/MapView":6,"./ViewTest":13}],13:[function(require,module,exports){

},{"../../../../resources/ts/Filtered/Controller":1,"../../../../resources/ts/Filtered/View/MapView":6,"./ViewTest":13}],13:[function(require,module,exports){
"use strict";
/// <reference types="qunit" />
/// <reference types="jquery" />
Expand Down Expand Up @@ -1490,8 +1490,8 @@ var ViewTest = /** @class */ (function (_super) {
return ViewTest;
}(QUnitTest_1.QUnitTest));
exports.ViewTest = ViewTest;

},{"../../../../resources/ts/Filtered/Controller":1,"../../../../resources/ts/Filtered/View/View":7,"../../Util/QUnitTest":15}],14:[function(require,module,exports){

},{"../../../../resources/ts/Filtered/Controller":1,"../../../../resources/ts/Filtered/View/View":7,"../../Util/QUnitTest":15}],14:[function(require,module,exports){
"use strict";
var __extends = (this && this.__extends) || (function () {
var extendStatics = function (d, b) {
Expand All @@ -1516,8 +1516,8 @@ var MockedFilter = /** @class */ (function (_super) {
return MockedFilter;
}(Filter_1.Filter));
exports.MockedFilter = MockedFilter;

},{"../../../resources/ts/Filtered/Filter/Filter":3}],15:[function(require,module,exports){

},{"../../../resources/ts/Filtered/Filter/Filter":3}],15:[function(require,module,exports){
"use strict";
exports.__esModule = true;
var QUnitTest = /** @class */ (function () {
Expand All @@ -1528,8 +1528,8 @@ var QUnitTest = /** @class */ (function () {
return QUnitTest;
}());
exports.QUnitTest = QUnitTest;

},{}],16:[function(require,module,exports){

},{}],16:[function(require,module,exports){
"use strict";
exports.__esModule = true;
var QUnitTestHandler = /** @class */ (function () {
Expand Down Expand Up @@ -1573,8 +1573,8 @@ var QUnitTestHandler = /** @class */ (function () {
return QUnitTestHandler;
}());
exports.QUnitTestHandler = QUnitTestHandler;

},{}],17:[function(require,module,exports){

},{}],17:[function(require,module,exports){
"use strict";
/// <reference types="qunit" />
exports.__esModule = true;
Expand All @@ -1595,5 +1595,5 @@ var testclasses = [
];
var testhandler = new QUnitTestHandler_1.QUnitTestHandler('ext.srf.formats.filtered', testclasses);
testhandler.runTests();

},{"./Filtered/ControllerTest":8,"./Filtered/Filter/DistanceFilterTest":9,"./Filtered/Filter/ValueFilterTest":10,"./Filtered/View/MapViewTest":12,"./Filtered/View/ViewTest":13,"./Filtered/ViewSelectorTest":11,"./Util/QUnitTestHandler":16}]},{},[17]);

},{"./Filtered/ControllerTest":8,"./Filtered/Filter/DistanceFilterTest":9,"./Filtered/Filter/ValueFilterTest":10,"./Filtered/View/MapViewTest":12,"./Filtered/View/ViewTest":13,"./Filtered/ViewSelectorTest":11,"./Util/QUnitTestHandler":16}]},{},[17]);

0 comments on commit 32cf562

Please sign in to comment.