Browse Source

Remove dead code, cleanup and start to move to ES6

pull/488/merge
Timothée Jaussoin 8 years ago
parent
commit
fd6983e457
  1. 48
      app/assets/js/movim_utils.js
  2. 2
      app/widgets/Avatar/Avatar.php
  3. 1
      app/widgets/Avatar/_avatar_form.tpl
  4. 4
      app/widgets/Chat/chat.js
  5. 8
      app/widgets/Chats/chats.js
  6. 21
      app/widgets/Menu/menu.js
  7. 5
      app/widgets/Rooms/rooms.js
  8. 26
      app/widgets/Roster/roster.css
  9. 23
      app/widgets/Roster/roster.js
  10. 11
      app/widgets/Search/search.js
  11. 1
      app/widgets/Vcard4/Vcard4.php
  12. 1
      app/widgets/Vcard4/_vcard4_form.tpl

48
app/assets/js/movim_utils.js

@ -78,14 +78,6 @@ var MovimUtils = {
return dec.replace(/\0+$/, '');
},
buttonReset: function(element) {
var elt = document.querySelector(element);
elt.className = elt.dataset.oldclassname;
},
buttonSave: function(element) {
var elt = document.querySelector(element);
elt.dataset.oldclassname = elt.className;
},
checkString: function(str) {
if (typeof str == 'object') {
return str instanceof String;
@ -206,19 +198,6 @@ var MovimUtils = {
element.classList.remove(classname);
}
},
removeClassInList: function(myclass, list) {
for(i = 0; i < list.length; i++) {
MovimUtils.removeClass(list[i], myclass);
}
},
htmlEscape: function(string) {
return String(string)
.replace(/&/g, '&amp;')
.replace(/"/g, '&quot;')
.replace(/'/g, '&#39;')
.replace(/</g, '&lt;')
.replace(/>/g, '&gt;');
},
textareaAutoheight: function(textbox) {
if(textbox != null) {
var val = MovimUtils.htmlEscape(textbox.value).replace(/\n/g, '<br>');
@ -252,35 +231,20 @@ var MovimUtils = {
}
},
enhanceArticlesContent: function() {
var items = document.querySelectorAll('article section content video');
document.querySelectorAll('article section content video')
.forEach(item => item.setAttribute('controls', 'controls'));
var i = 0;
while(i < items.length)
{
items[i].setAttribute('controls', 'controls');
i++;
}
var links = document.querySelectorAll('article section content a:not(.innertag)');
var i = 0;
while(i < links.length)
{
links[i].setAttribute('target', '_blank');
i++;
}
document.querySelectorAll('article section content a:not(.innertag)')
.forEach(link => link.setAttribute('target', '_blank'));
},
urlParts : function() {
var str = window.location.search.split('/');
var page = str[0].substr(1);
str.shift();
var str = str.map(function(param) {
return decodeURIComponent(param);
});
var str = str.map(param => decodeURIComponent(param));
var parts = {'page': page, 'params': str, 'hash': window.location.hash.substr(1)};
return parts;
return {'page': page, 'params': str, 'hash': window.location.hash.substr(1)};
},
getOrientation : function(file, callback) {
var reader = new FileReader();

2
app/widgets/Avatar/Avatar.php

@ -51,9 +51,7 @@ class Avatar extends \Movim\Widget\Base
$p->get($this->user->getLogin());
$avatarform->assign('photobin', $p->toBase());
$avatarform->assign('me', $me);
$avatarform->assign(
'submit',
$this->call('ajaxSubmit', "MovimUtils.formToJson('avatarform')")

1
app/widgets/Avatar/_avatar_form.tpl

@ -81,7 +81,6 @@
type="button"
onclick="
{$submit}
MovimUtils.buttonSave('#avatarvalidate');
this.value = '{$c->__('button.submitting')}';
this.className='button inactive oppose';"
class="button color oppose"

4
app/widgets/Chat/chat.js

@ -354,8 +354,8 @@ var Chat = {
&& msgStack.parentNode == refBubble
&& data.file === null
&& data.sticker === null
&& !MovimUtils.hasClass(refBubble.querySelector('div.bubble'), "sticker")
&& !MovimUtils.hasClass(refBubble.querySelector('div.bubble'), "file")
&& !refBubble.querySelector('div.bubble').classList.contains('sticker')
&& !refBubble.querySelector('div.bubble').classList.contains('file')
){
bubble = msgStack.parentNode;
mergeMsg = true;

8
app/widgets/Chats/chats.js

@ -13,10 +13,11 @@ var Chats = {
Rooms.refresh();
Chat_ajaxGet(this.dataset.jid);
MovimUtils.removeClassInList('active', items);
Notification_ajaxClear('chat|' + this.dataset.jid);
Notification.current('chat|' + this.dataset.jid);
MovimUtils.addClass(this, 'active');
items.forEach(item => item.classList.remove('active'));
this.classList.add('active');
};
items[i].onmousedown = function(e) {
@ -31,8 +32,7 @@ var Chats = {
}
}
MovimUtils.removeClass(items[i], 'active');
items[i].classList.remove('active');
i++;
}

21
app/widgets/Menu/menu.js

@ -17,26 +17,6 @@ var Menu = {
} else {
Menu_ajaxGetAll();
}
},
refresh: function() {
var items = document.querySelectorAll('ul#menu_wrapper li, #post_widget ul.card li');
var i = 0;
while(i < items.length)
{
if(items[i].id != 'history') {
items[i].onclick = function(e) {
if(this.dataset.id) {
MovimTpl.showPanel();
Post_ajaxGetPost(this.dataset.server, this.dataset.node, this.dataset.id);
//Menu_ajaxGetNode(this.dataset.server, this.dataset.node);
MovimUtils.removeClassInList('active', items);
MovimUtils.addClass(this, 'active');
}
}
}
i++;
}
}
};
@ -44,5 +24,4 @@ MovimWebsocket.attach(function() {
Menu.init();
Notification_ajaxClear('news');
Notification.current('news');
Menu.refresh();
});

5
app/widgets/Rooms/rooms.js

@ -10,9 +10,10 @@ var Rooms = {
items[i].onclick = function(e) {
Chats.refresh();
items.forEach(item => item.classList.remove('active'));
this.classList.add('active');
Chat_ajaxGetRoom(this.dataset.jid);
MovimUtils.removeClassInList('active', items);
MovimUtils.addClass(this, 'active');
}
}

26
app/widgets/Roster/roster.css

@ -41,33 +41,7 @@
display: list-item;
}
/* Chat button */
/*
#roster ul#rosterlist li .chat {
width: 2rem;
height: 2rem;
left: 5.5rem;
top: 3.5rem;
position: absolute;
border-radius: 2em;
background-color: #DDD;
}
*/
/* Search */
/*
#roster ul li.subheader.search,
#roster.search ul#rosterlist div.groupshown > li {
display: none;
}
#roster.search ul li.subheader.search,
#roster.search ul#rosterlist div > li.found {
display: list-item;
}
*/
#roster.search ul#rosterlist li:not(.found) {
display: none;
}

23
app/widgets/Roster/roster.js

@ -7,28 +7,19 @@ var Roster = {
var rosterlist = document.querySelector('#rosterlist');
search.oninput = function(event) {
if(search.value.length > 0) {
MovimUtils.addClass(roster, 'search');
roster.classList.add('search');
} else {
MovimUtils.removeClass(roster, 'search');
roster.classList.remove('search');
}
// We clear the old search
var selector_clear = '#rosterlist > li.found';
var li = document.querySelectorAll(selector_clear);
MovimUtils.removeClassInList('found', li);
document.querySelectorAll(
'#rosterlist > li.found'
).forEach(item => item.classList.remove('found'));
var founds = document.querySelectorAll(
document.querySelectorAll(
'#rosterlist > li[name*="' + MovimUtils.cleanupId(search.value).slice(3) + '"]'
);
if(founds) {
for(i = 0; i < founds.length; i++) {
MovimUtils.addClass(founds[i], 'found');
}
}
).forEach(item => item.classList.add('found'));;
};
},
setFound : function(jid) {

11
app/widgets/Search/search.js

@ -6,22 +6,19 @@ var Search = {
roster : function(key) {
var selector_clear = '#search > #roster > li.found';
var subheader = document.querySelector('#search > #roster > li.subheader');
var li = document.querySelectorAll(selector_clear);
MovimUtils.removeClassInList('found', li);
document.querySelectorAll(selector_clear)
.forEach(item => item.classList.remove('found'));
if(key == '') return;
var founds = document.querySelectorAll(
'#search > #roster > li[name*="' + MovimUtils.cleanupId(key).slice(3) + '"]'
);
)
if(founds.length > 0) {
subheader.classList.add('found');
for(i = 0; i < founds.length; i++) {
MovimUtils.addClass(founds[i], 'found');
if(i > 4) break;
}
founds.forEach(item => item.classList.add('found'));
} else if(subheader) {
subheader.classList.remove('found');
}

1
app/widgets/Vcard4/Vcard4.php

@ -65,7 +65,6 @@ class Vcard4 extends \Movim\Widget\Base
function onMyVcard4Received()
{
$this->rpc('MovimUtils.buttonReset', '#vcard4validate');
Notification::append(null, $this->__('vcard.updated'));
}

1
app/widgets/Vcard4/_vcard4_form.tpl

@ -141,7 +141,6 @@
<button
onclick="
{$submit}
MovimUtils.buttonSave('#vcard4validate');
this.value = '{$c->__('button.submitting')}';
this.className='button oppose inactive';"
class="button color oppose"

Loading…
Cancel
Save