keith
/
friendica
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removing extraneous line feeds in conditions

This commit is contained in:
Hypolite Petovan 2017-01-08 11:02:30 +11:00
parent d7c9b293d3
commit 05e68de695
1 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
view/theme/frost/js/theme.js
View File

@ -61,8 +61,7 @@ $(document).ready(function() {
if ($('#id_share').is(':checked')) { if ($('#id_share').is(':checked')) {
$('#acl-wrapper').show(); $('#acl-wrapper').show();
} } else {
else {
$('#acl-wrapper').hide(); $('#acl-wrapper').hide();
} }
}).trigger('change'); }).trigger('change');
@ -357,8 +356,7 @@ function showNavMenu(menuID) {
if (window.navMenuTimeout[menuID + '-closing']) { if (window.navMenuTimeout[menuID + '-closing']) {
window.navMenuTimeout[menuID + '-closing'] = false; window.navMenuTimeout[menuID + '-closing'] = false;
clearTimeout(window.navMenuTimeout[menuID + '-timeout']); clearTimeout(window.navMenuTimeout[menuID + '-timeout']);
} } else {
else {
window.navMenuTimeout[menuID + '-opening'] = true; window.navMenuTimeout[menuID + '-opening'] = true;
window.navMenuTimeout[menuID + '-timeout'] = setTimeout( function () { window.navMenuTimeout[menuID + '-timeout'] = setTimeout( function () {
@ -373,8 +371,7 @@ function hideNavMenu(menuID) {
if (window.navMenuTimeout[menuID + '-opening']) { if (window.navMenuTimeout[menuID + '-opening']) {
window.navMenuTimeout[menuID + '-opening'] = false; window.navMenuTimeout[menuID + '-opening'] = false;
clearTimeout(window.navMenuTimeout[menuID + '-timeout']); clearTimeout(window.navMenuTimeout[menuID + '-timeout']);
} } else {
else {
window.navMenuTimeout[menuID + '-closing'] = true; window.navMenuTimeout[menuID + '-closing'] = true;
window.navMenuTimeout[menuID + '-timeout'] = setTimeout( function () { window.navMenuTimeout[menuID + '-timeout'] = setTimeout( function () {
@ -421,8 +418,7 @@ function InitMCEEditor(editorData) {
if (window.editSelect != 'none') { if (window.editSelect != 'none') {
$.extend(tinyMCEInitConfig, editorData); $.extend(tinyMCEInitConfig, editorData);
tinyMCE.init(tinyMCEInitConfig); tinyMCE.init(tinyMCEInitConfig);
} } else if (typeof editorData.plaintextFn == 'function') {
else if (typeof editorData.plaintextFn == 'function') {
(editorData.plaintextFn)(); (editorData.plaintextFn)();
} }
} }
@ -458,16 +454,14 @@ function initEditor(cb) {
} }
if (cPopup.ready && match[1]!==cPopup.searchText) cPopup.search(match[1]); if (cPopup.ready && match[1]!==cPopup.searchText) cPopup.search(match[1]);
if (! cPopup.ready) cPopup = null; if (! cPopup.ready) cPopup = null;
} } else {
else {
if (cPopup !== null) { cPopup.close(); cPopup = null; } if (cPopup !== null) { cPopup.close(); cPopup = null; }
} }
textlen = txt.length; textlen = txt.length;
if (textlen != 0 && $('#jot-perms-icon').is('.unlock')) { if (textlen != 0 && $('#jot-perms-icon').is('.unlock')) {
$('#profile-jot-desc').html(window.isPublic); $('#profile-jot-desc').html(window.isPublic);
} } else {
else {
$('#profile-jot-desc').html(' '); $('#profile-jot-desc').html(' ');
} }
@ -550,16 +544,14 @@ function msgInitEditor() {
} }
if (cPopup.ready && match[1]!==cPopup.searchText) cPopup.search(match[1]); if (cPopup.ready && match[1]!==cPopup.searchText) cPopup.search(match[1]);
if (! cPopup.ready) cPopup = null; if (! cPopup.ready) cPopup = null;
} } else {
else {
if (cPopup !== null) { cPopup.close(); cPopup = null; } if (cPopup !== null) { cPopup.close(); cPopup = null; }
} }
textlen = txt.length; textlen = txt.length;
if (textlen != 0 && $('#jot-perms-icon').is('.unlock')) { if (textlen != 0 && $('#jot-perms-icon').is('.unlock')) {
$('#profile-jot-desc').html(window.isPublic); $('#profile-jot-desc').html(window.isPublic);
} } else {
else {
$('#profile-jot-desc').html(' '); $('#profile-jot-desc').html(' ');
} }
}); });
@ -632,9 +624,9 @@ function addeditortext(textElem, data) {
if (window.editSelect == 'none') { if (window.editSelect == 'none') {
var currentText = $(textElem).val(); var currentText = $(textElem).val();
$(textElem).val(currentText + data); $(textElem).val(currentText + data);
} } else {
else
tinyMCE.execCommand('mceInsertRawHTML',false,data); tinyMCE.execCommand('mceInsertRawHTML',false,data);
}
} }
function jotVideoURL() { function jotVideoURL() {
@ -733,8 +725,7 @@ function deleteCheckedItems(delID) {
if ($(this).is(':checked')) { if ($(this).is(':checked')) {
if (checkedstr.length != 0) { if (checkedstr.length != 0) {
checkedstr = checkedstr + ',' + $(this).val(); checkedstr = checkedstr + ',' + $(this).val();
} } else {
else {
checkedstr = $(this).val(); checkedstr = $(this).val();
} }
} }