Skip to content
This repository has been archived by the owner on Apr 11, 2022. It is now read-only.

Commit

Permalink
0.1.1.3
Browse files Browse the repository at this point in the history
  • Loading branch information
@aleqsunder
aleqsunder committed Jul 12, 2019
1 parent 1d7b959 commit 6455485
Show file tree
Hide file tree
Showing 5 changed files with 183 additions and 91 deletions.
75 changes: 64 additions & 11 deletions assets/integr.js
View file
@@ -1,7 +1,7 @@
/**
* Неизменяемые переменные
*/
const version = '0.1.1.1', tinyMods = [ 'threads', 'conversation', 'settings' ],
const version = '0.1.1.2', tinyMods = [ 'threads', 'conversation', 'settings' ],
otherMods = [ 'conversations', 'category', 'forums', 'notifications', 'unknown' ];

/**
Expand All @@ -13,6 +13,7 @@ var afp = __('fullpage'),
asspages = $_('asett pages[name="pagesetting"] page', afp),
asstabes = __('asett pages[name="tabsetting"]', afp),
assscroll = __('asett pages[name="scrollbar"]', afp),
asschat = __('asettchat pages[name="st"]', afp),
chess = 'a-dota2smile', storageCache = _getStorage(),
storagePage = JSON.parse(localStorage.getItem('page')),
cath = JSON.parse(localStorage.getItem('cath')),
Expand Down Expand Up @@ -45,6 +46,35 @@ if (mode == 'unknown' && __('head title').innerText == 'Форум Dota 2')

vars[attr] = color;
}

setInterval
( function () {
var stab = __('div.smiles-panel ul.tabs');

if (stab)
{
stab.querySelectorAll('a').forEach
( function (a){
var page = JSON.parse(localStorage.getItem('page')),
a = a;
// получаемая переменная может работать только в пределах своей ф-ии

// Проверяем, есть ли вообще такой объект в локалке
if (page)
{
Object.keys(page).forEach
( function (b, index) {
var index = a.dataset.cat.toString();

a.textContent = page[index].name;

if (page[index].is == false)
a.style = 'display: none';
});
}
});
}
}, 200);

$_(`pages[name='colorpicker'] input`).forEach
(function (a) {
Expand All @@ -57,6 +87,9 @@ if (mode == 'unknown' && __('head title').innerText == 'Форум Dota 2')
styleSet('f-background', vars['f-background']);
styleSet('f-chat-background', vars['f-chat-background']);

__('input[caller="chat-avatar"]', asschat).checked
= JSON.parse(localStorage.getItem('--chat-avatar')) === true;

function styleSet (name, value)
{ __('body').style.setProperty(`--${name}`, value) }

Expand All @@ -77,6 +110,15 @@ if (mode == 'unknown' && __('head title').innerText == 'Форум Dota 2')
vars[name] = default_vars[name];
}

function chatSetting ()
{
console.log(this);
var name = this.getAttribute('caller');

localSet(`--${name}`, this.checked);
Chat.getChatMessages(true);
}

var old_time = '0',
array_notify = [];

Expand All @@ -100,12 +142,13 @@ if (mode == 'unknown' && __('head title').innerText == 'Форум Dota 2')
if (skipDuplicates && $('#chatMessage' + data.id).length > 0)
$('#chatMessage' + data.id).remove();

var chatBlock = $(".chatMessages"),
var enableUserAvatar = JSON.parse(localStorage.getItem('--chat-avatar')) === true,
chatBlock = $(".chatMessages"),
liClass = (data.visible !== undefined && !data.visible) ? 'not-visible' : '',
id = (data.id !== undefined) ? `id="chatMessage${data.id}"` : '',
username = (data.username && data.username.length > 0) ? Base64.encode(data.username) : 'NONE',
youser = data.user_id == Utils.user_id,
repeater = (youser) ? ` type='your message'` : '',
repeater = !!enableUserAvatar ? (youser ? ` type='your message'` : '') : '',
nickname = Utils.username,
isGlued = "", html = "", moderation = "";

Expand Down Expand Up @@ -202,7 +245,7 @@ if (mode == 'unknown' && __('head title').innerText == 'Форум Dota 2')
chat_avatar = $('.chatAvatar', last_message),
last_nickname = $('.username', last_message).html() == data.username,
user_href = `members/${data.username_parsed}.${data.user_id}/`,
user_nick_v = (youser) ? 'none' : 'inline',
user_nick_v = enableUserAvatar ? (youser ? 'none' : 'inline') : 'inline',
user_style = `color: ${data.nick_color}; display: ${user_nick_v}`,
display = (last_nickname == true && can_new)? 'none' : 'inline',
avatar =
Expand Down Expand Up @@ -256,7 +299,7 @@ if (mode == 'unknown' && __('head title').innerText == 'Форум Dota 2')
${chat_message}
</div>`;

if (data.username != nickname)
if (data.username != nickname || enableUserAvatar != 'inline')
{
html = avatar + html;
}
Expand Down Expand Up @@ -447,7 +490,7 @@ if (mode == 'unknown' && __('head title').innerText == 'Форум Dota 2')

chatTitle.appendChild
(dom(
`<a onclick="adoor('asett'); return false" data-id="chatBlock" data-title="Настройки расширения" href="#" class="right fa fa-wrench"></a>`
`<a onclick="adoor('asettchat'); return false" data-id="chatBlock" data-title="Настройки расширения" href="#" class="right fa fa-wrench"></a>`
));

var red = (localStorage.getItem('chatTurn') == 'true') ? '' : ' red';
Expand Down Expand Up @@ -510,7 +553,7 @@ function reload ()

if (!cath)
{
localStorage.setItem('cath', `{"0":{"name":"Без категории","index":"100","hidden":"false"}}`);
localStorage.setItem('cath', `[{"name":"Без категории","index":"100","hidden":"false"}]`);
cath = JSON.parse(localStorage.getItem('cath'));
}

Expand Down Expand Up @@ -997,13 +1040,23 @@ function CEtoggle ()
}

/**
* Сохранение смайлов в LS
* Сохранение смайлов
*/
function save ()
{
var tabs = [], tabes = JSON.parse(localStorage.getItem('cath'));
localStorage.setItem(chess, JSON.stringify({}));

/**
* Костыльное избавление от бага прошлых версий
* Уберу через парочку версий, когда исправится у всех
*/

try
{ tabes.forEach() }
catch (e)
{ savePages(`Ошибка ${e.name} исправлена, обновите страницу:<br>${e.message}`) }

$_('list', smileList).forEach
( function(a) {
var value =
Expand Down Expand Up @@ -1102,11 +1155,11 @@ function loadFrom (bool)
/**
* Сохранение списка страниц
*/
function savePages ()
function savePages (output)
{
var pages = $_("asett pages[name='pagesetting'] page"),
tabs = $_("asett pages[name='tabsetting'] page"),
arrayPage = {}, arrayTab = {}, j = 0;
arrayPage = {}, arrayTab = [], j = 0;

pages.forEach
( function (a) {
Expand Down Expand Up @@ -1152,7 +1205,7 @@ function savePages ()
openAlert
({
titleOf: 'Настройки',
text: 'Отображение изменено по вашему усмотрению!'
text: output || 'Отображение изменено по вашему усмотрению!'
});
}

Expand Down
19 changes: 16 additions & 3 deletions assets/sett.html
View file
Expand Up @@ -71,9 +71,9 @@
</middle>
</savetouser>

<backfon class='asett' onclick="adoor('asett')"></backfon>
<asett>
<top>Настройки <close class='fa fa-times' onclick="adoor('asett')"></close></top>
<backfon class='asettchat' onclick="adoor('asettchat')"></backfon>
<asettchat>
<top>Настройки <close class='fa fa-times' onclick="adoor('asettchat')"></close></top>
<middle>
<top>Настройка чата</top>
<pages name='colorpicker'>
Expand Down Expand Up @@ -107,6 +107,19 @@
</page>
</pages>

<pages name='st'>
<page class='check fullstroke'>
<input type="checkbox" caller="chat-avatar" onchange="chatSetting.call(this)">
<gotcha>Отображать свои сообщения отдельно</gotcha>
</page>
</pages>
</middle>
</asettchat>

<backfon class='asett' onclick="adoor('asett')"></backfon>
<asett>
<top>Настройки <close class='fa fa-times' onclick="adoor('asett')"></close></top>
<middle>
<top>Видимые разделы</top>
<pages name='pagesetting'>
Для изменения отображения используется чекбокс (галочка рядом с пунктом), для изменения
Expand Down
30 changes: 24 additions & 6 deletions extension.css
View file
Expand Up @@ -68,7 +68,7 @@ backfon
}

backfon.loadfrom, backfon.saveto,
backfon.asett, backfon.chan
backfon.asett, backfon.asettchat, backfon.chan
{
margin-top: -1000%;
z-index: 10003;
Expand All @@ -87,21 +87,21 @@ fullpage *

fullpage.open, smiles.open,
loadfrom.open, saveto.open, savetouser.open,
alert.open, asett.open, backfon.open,
alert.open, asett.open, asettchat.open, backfon.open,
chan.open, wellcome.open
{
opacity: 1;
}

fullpage.margin, smiles.margin,
loadfrom.margin, saveto.margin, savetouser.margin,
alert.margin, asett.margin, backfon.margin,
alert.margin, asett.margin, asettchat.margin, backfon.margin,
chan.margin, wellcome.margin
{
margin-top: 0;
}

smiles, loadfrom, saveto, savetouser, asett, alert, chan, wellcome
smiles, loadfrom, saveto, savetouser, asett, asettchat, alert, chan, wellcome
{
position: absolute;

Expand All @@ -119,7 +119,7 @@ smiles, loadfrom, saveto, savetouser, asett, alert, chan, wellcome
}

smiles { margin-top: -1000%; z-index: 10002; }
loadfrom, saveto, asett, chan { margin-top: -1000%; z-index: 10004; }
loadfrom, saveto, asett, asettchat, chan { margin-top: -1000%; z-index: 10004; }
alert, savetouser, wellcome { margin-top: -1000%; z-index: 10006; }

fullpage top
Expand Down Expand Up @@ -153,7 +153,7 @@ fullpage middle

@media (max-width: 600px)
{
smiles, loadfrom, saveto, asett, chan
smiles, loadfrom, saveto, asett, asettchat, chan
{
width: 100%;
height: 100%;
Expand Down Expand Up @@ -193,6 +193,24 @@ pages page
align-items: center;
}

pages page.fullstroke
{
width: 100%;
padding: 0px 9px;
margin: 3px;
border-radius: 3px;
background: #2b2c32;
justify-content: center;
align-items: center;
}

.fullstroke gotcha
{
width: 100%;
padding: 9px;
padding-left: 5px;
}

pages page .page-centered
{
display: flex;
Expand Down

0 comments on commit 6455485

Please sign in to comment.