Browse Source

Refactor and cleanup JS functions

pull/826/head
Timothée Jaussoin 7 years ago
parent
commit
f20342ceaf
  1. 2
      app/assets/js/movim_avatar.js
  2. 17
      app/assets/js/movim_tpl.js
  3. 31
      app/assets/js/movim_utils.js
  4. 2
      app/views/page.tpl
  5. 2
      app/widgets/AdminTest/admintest.js
  6. 4
      app/widgets/Chat/_chat.tpl
  7. 8
      app/widgets/Chat/chat.js
  8. 2
      app/widgets/Post/post.js

2
app/assets/js/movim_avatar.js

@ -55,7 +55,7 @@ var MovimAvatar = {
var preview = document.querySelector('form[name=' + formname + '] img');
var list = document.querySelector('form[name=' + formname + '] ul');
if (list) MovimUtils.hideElement(list);
if (list) list.classList.add('hide');
var input = document.querySelector('form[name=' + formname + '] input[name="photobin"]');

17
app/assets/js/movim_tpl.js

@ -8,10 +8,6 @@ var MovimTpl = {
dragged : false,
moving : false,
percent : false,
init : function() {
if (document.getElementById('back') != null)
MovimUtils.hideElement(document.getElementById('back'));
},
append : function(selector, html) {
target = document.querySelector(selector);
if (target) {
@ -30,10 +26,10 @@ var MovimTpl = {
} else if (Dialog.filled()) {
Dialog.clear();
// If the menu is shown
} else if (MovimUtils.hasClass('body > nav', 'active')) {
MovimUtils.removeClass('body > nav', 'active');
} else if (document.querySelector('body > nav').classList.contains('active')) {
document.querySelector('body > nav').classList.remove('active');
// If the panel is shown
} else if (MovimTpl.isPanel()) {
} else if (document.querySelector('main').classList.contains('enabled')) {
MovimTpl.hidePanel();
window.history.back();
} else {
@ -61,9 +57,6 @@ var MovimTpl = {
MovimUtils.removeClass('main', 'enabled');
MovimUtils.removeClass('ul#bottomnavigation', 'hidden');
},
isPanel: function() {
return MovimUtils.hasClass('main', 'enabled');
},
isPanelScrolled: function() {
var selector = document.querySelector('main > div:first-child:nth-last-child(2) > div');
@ -105,9 +98,6 @@ var MovimTpl = {
replacedNode = target.parentNode.replaceChild(element, target);
}
},
toggleActionButton : function() {
document.querySelector('.button.action').classList.toggle('active');
},
toggleContextMenu : function(e) {
var contextMenu = document.querySelector('ul.context_menu');
if (contextMenu == null) return;
@ -176,7 +166,6 @@ var MovimTpl = {
};
movim_add_onload(function() {
MovimTpl.init();
MovimTpl.touchEvents();
document.body.addEventListener('click', MovimTpl.toggleContextMenu, false);
});

31
app/assets/js/movim_utils.js

@ -77,25 +77,6 @@ var MovimUtils = {
return str;
},
hasClass: function(element, classname) {
var node = element;
if (typeof node == 'string')
node = MovimUtils.getNode(node);
if (!node) return false;
return node.classList.contains(classname);
},
showElement: function(element) {
if (!MovimUtils.hasClass(element, 'show'))
MovimUtils.addClass(element, 'show');
if (MovimUtils.hasClass(element, 'hide'))
MovimUtils.removeClass(element, 'hide');
},
hideElement: function(element) {
if (!MovimUtils.hasClass(element, 'hide'))
MovimUtils.addClass(element, 'hide');
if (MovimUtils.hasClass(element, 'show'))
MovimUtils.removeClass(element, 'show');
},
pushState: function(url) {
window.history.pushState(null, '', url);
},
@ -109,16 +90,12 @@ var MovimUtils = {
window.location.reload();
},
addClass: function(element, classname) {
if (!MovimUtils.hasClass(element, classname)) {
element = MovimUtils.getNode(element);
element.classList.add(classname);
}
let element = document.querySelector(element);
if (element) element.classList.add(classname);
},
removeClass: function(element, classname) {
if (MovimUtils.hasClass(element, classname)) {
element = MovimUtils.getNode(element);
element.classList.remove(classname);
}
let element = document.querySelector(element);
if (element) element.classList.remove(classname);
},
textareaAutoheight: function(textbox) {
if (textbox != null) {

2
app/views/page.tpl

@ -58,7 +58,7 @@
<?php } ?>
<div id="hiddendiv"></div>
<div id="snackbar" class="snackbar"></div>
<div id="error_websocket" class="snackbar hide">
<div id="error_websocket" class="snackbar hide" onclick="MovimUtils.reloadThis()">
<ul class="list">
<li>
<span class="control icon gray">

2
app/widgets/AdminTest/admintest.js

@ -22,7 +22,7 @@ var AdminTest = {
MovimUtils.addClass('figure #browser-daemon', 'success');
MovimUtils.addClass('div #xmpp-daemon', 'success');
MovimUtils.hideElement(MovimUtils.getNode('#websocket_error'));
document.querySelector('#websocket_error').classList.add('hide');
},
enableAPI : function() {

4
app/widgets/Chat/_chat.tpl

@ -2,7 +2,7 @@
{if="$muc"}
<ul class="list middle">
<li>
<span id="back" class="primary icon active"
<span class="primary icon active"
{if="!$anon"}
onclick="Chat_ajaxGet()"
{/if}>
@ -133,7 +133,7 @@
{else}
<ul class="list middle">
<li id="chat_header">
<span onclick="Chat_ajaxGet()" id="back" class="primary icon active">
<span onclick="Chat_ajaxGet()" class="primary icon active">
<i class="material-icons">arrow_back</i>
</span>

8
app/widgets/Chat/chat.js

@ -665,11 +665,11 @@ var Chat = {
var attachment_button = document.querySelector('.chat_box span.upload');
if (send_button && attachment_button) {
if (Chat.getTextarea().value.length > 0) {
MovimUtils.showElement(send_button);
MovimUtils.hideElement(attachment_button);
send_button.classList.remove('hide');
attachment_button.classList.add('hide');
} else {
MovimUtils.showElement(attachment_button);
MovimUtils.hideElement(send_button);
send_button.classList.add('hide');
attachment_button.classList.remove('hide');
}
}
},

2
app/widgets/Post/post.js

@ -1,6 +1,6 @@
var Post = {
comment: function() {
MovimUtils.showElement(document.querySelector('#comment_add'));
document.querySelector('#comment_add').classList.remove('hide');
},
share : function() {
var parts = MovimUtils.urlParts();

Loading…
Cancel
Save