infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

actually fix weird checkbox logic, and lint compliance

pull/1/head
ansuz 2018-03-19 17:13:44 +01:00
parent dc783ce3e4
commit bd6b6dcb49
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
www/common/common-ui-elements.js
View File

@ -371,11 +371,11 @@ define([
common.getAttribute(['general', 'share'], function (err, val) {
val = val || {};
if (val.edit === false) {
$(link).find('#cp-share-editable-false').attr('checked', true);
$(link).find('#cp-share-editable-false').prop('checked', true);
}
else { $(link).find('#cp-share-editable-true').attr('checked', true); }
if (val.embed) { $(link).find('#cp-share-embed').attr('checked', true); }
if (val.present) { $(link).find('#cp-share-present').attr('checked', true); }
else { $(link).find('#cp-share-editable-true').prop('checked', true); }
if (val.embed) { $(link).find('#cp-share-embed').prop('checked', true); }
if (val.present) { $(link).find('#cp-share-present').prop('checked', true); }
$(link).find('#cp-share-link-preview').val(getLinkValue(val));
});
common.getMetadataMgr().onChange(function () {

12
www/common/common-util.js
View File

@ -249,8 +249,16 @@ define([], function () {
Util.isChecked = function (el) {
// could be nothing...
if (!el) { return false; }
// jquery or dom elements should both be fine with this
return Boolean($(el).prop('checked'));
// check if it's a dom element
if (typeof(el.tagName) !== 'undefined') {
return Boolean(el.checked);
}
// sketchy test to see if it's jquery
if (typeof(el.prop) === 'function') {
return Boolean(el.prop('checked'));
}
// else just say it's not checked
return false;
};
return Util;