lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-27 04:19:04 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

#20926: Correctly considering data-defaultstate

Browse Source
This commit is contained in:
Stanley Goldman
2014-09-05 11:22:00 -04:00
committed by Nicholas Mayne
parent f9404e4cd7
commit 5a2f7be1af
1 changed files with 15 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/Orchard.Web/Core/Shapes/Scripts/base.js
View File

@@ -137,28 +137,25 @@
var _this = $(this);
var _controllees = $("[data-controllerid=" + _this.attr("id") + "]");
var hide = true;
_controllees.each(function () {
var _controllee = $(this);
var hidden = _controllee.attr("data-defaultstate") == "hidden";
var _controlleeIsHidden = _controllee.is(":hidden");
if (_this.is(":checked") || _this.is(":selected")) {
hide = hidden;
}
else {
hide = !hidden;
}
var hiddenByDefault = _controllee.attr("data-defaultstate") == "hidden";
var checkedOrSelected = _this.is(":checked") || _this.is(":selected");
if (!hide) {
if (_controlleeIsHidden) {
if (checkedOrSelected) {
if (!hiddenByDefault) {
_controllee.hide().show(); // <- unhook this when the following comment applies
// _controllees.slideUp(200); // <- hook this back up when chrome behaves, or when I care less...or when chrome behaves
} else {
_controllee.hide();
}
} else {
if (!hiddenByDefault) {
_controllee.hide();
} else {
_controllee.show();
}
} else if (!_controlleeIsHidden) {
// _controllees.slideUp(200); // <- hook this back up when chrome behaves, or when I care less...or when chrome behaves
_controllee.hide()
}
});
@@ -175,26 +172,16 @@
return;
}
controller.data("isControlling", 1);
if (!controller.is(":checked") && !controller.is(":selected")) {
$("[data-controllerid=" + controller.attr("id") + "]").hide();
}
if (controller.is(":checkbox")) {
controller.click($(this).toggleWhatYouControl);
controller.click($(this).toggleWhatYouControl).each($(this).toggleWhatYouControl);
} else if (controller.is(":radio")) {
$("[name=" + controller.attr("name") + "]").click(function () { $("[name=" + $(this).attr("name") + "]").each($(this).toggleWhatYouControl); });
}
else if (controller.is("option")) {
controller.parent().change(function () {
controller.toggleWhatYouControl();
});
}).each($(this).toggleWhatYouControl);
}
// if data-defaultstate is 'hidden' hide it by default
var hidden = $(this).attr("data-defaultstate") == "hidden";
if (hidden) {
$(this).hide();
}
});
});
// inline form link buttons (form.inline.link button) swapped out for a link that submits said form