Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-11 08:25:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixes checkboxes for settingsv2 (deja vu)

Browse Source
This commit is contained in:
psychobunny
2015-07-20 17:13:25 -04:00
parent a3c41e7fdb
commit fdc66eb607
3 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
public/src/admin/admin.js
View File

@@ -14,7 +14,7 @@
activateMobile(); activateMobile();
} }
$(window).on('action:ajaxify.end', function(ev, data) { $(window).on('action:ajaxify.contentLoaded', function(ev, data) {
var url = data.url; var url = data.url;
selectMenuItem(data.url); selectMenuItem(data.url);
@@ -23,6 +23,8 @@
setupCheckboxes(); setupCheckboxes();
}); });
$(window).on('action:admin.settingsLoaded', setupCheckboxes);
$('[component="logout"]').on('click', app.logout); $('[component="logout"]').on('click', app.logout);
$(window).resize(setupHeaderMenu); $(window).resize(setupHeaderMenu);
@@ -175,19 +177,6 @@
return $('[type=checkbox]').show(); return $('[type=checkbox]').show();
} }
$('[type=checkbox]').each(function() {
var checkbox = $(this),
checked = checkbox.is(':checked');
checkbox.hide();
if (checked) {
checkbox.after('<i class="fa fa-toggle-on"></i>');
}
else {
checkbox.after('<i class="fa fa-toggle-off"></i>');
}
});
$('[type=checkbox]').change(function() { $('[type=checkbox]').change(function() {
var checked = $(this).is(':checked'); var checked = $(this).is(':checked');
@@ -195,11 +184,25 @@
.toggleClass('fa-toggle-on', checked); .toggleClass('fa-toggle-on', checked);
}); });
$.propHooks.checked = { $('[type=checkbox]').each(function() {
set: function(elem, value, name) { var checkbox = $(this),
$(elem).trigger("change"); checked = checkbox.is(':checked');
if (checkbox.attr('data-toggle-added')) {
return;
} }
};
checkbox.hide();
if (checked) {
checkbox.after('<i class="fa fa-toggle-on"></i>');
}
else {
checkbox.after('<i class="fa fa-toggle-off"></i>');
}
checkbox.attr('data-toggle-added', true);
});
} }
}()); }());

2
public/src/admin/settings.js
View File

@@ -104,6 +104,8 @@ define('admin/settings', ['uploader', 'sounds'], function(uploader, sounds) {
if (typeof callback === 'function') { if (typeof callback === 'function') {
callback(); callback();
} }
$(window).trigger('action:admin.settingsLoaded');
}; };
function handleUploads() { function handleUploads() {

1
public/src/modules/settings.js
View File

@@ -471,6 +471,7 @@ define('settings', function () {
} }
$(formEl).deserialize(values); $(formEl).deserialize(values);
$(window).trigger('action:admin.settingsLoaded');
callback(null, values); callback(null, values);
}); });