Skip to content
This repository was archived by the owner on Mar 29, 2021. It is now read-only.

fixes #118 #312

Merged
w20k merged 10 commits into from
Apr 11, 2017
Merged

fixes #118 #312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
3a68c1c
fixes #118
Idrinth Apr 11, 2017
974e46e
simplifications of observer
Idrinth Apr 11, 2017
cb8abc7
making ! less confusing I hope
Idrinth Apr 11, 2017
3433daa
making ! less confusing I hope
Idrinth Apr 11, 2017
0ec836a
fixes #313
Idrinth Apr 11, 2017
4dc3044
removing unecessary condition
Idrinth Apr 11, 2017
e7fb594
fixing is-os check
Idrinth Apr 11, 2017
4f5df5e
extracting contions for title into function
Idrinth Apr 11, 2017
c35c841
adding missing radix parameter
Idrinth Apr 11, 2017
a87366b
making sure is-os class can actually be set
Idrinth Apr 11, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions src/mods/core.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,10 +159,14 @@ idrinth.core = {
if ( window.Notification.permission === "denied" ) {
return false;
}
return new window.Notification ( title, {
icon: "https://dotd.idrinth.de/Resources/Images/logo.png",
body: content
} );
var data = {};
if(idrinth.settings.get ('notification#image')) {
data.icon = "https://dotd.idrinth.de/Resources/Images/logo.png";
}
if(idrinth.settings.get ('notification#content')) {
data.body = content;
}
return new window.Notification ( title, data );
},
/**
*
Expand Down
53 changes: 36 additions & 17 deletions src/mods/observer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,28 +24,47 @@ idrinth.observer = {
*/
var handleLink = function ( element ) {
var href = element.getAttribute ( 'href' );
if ( href && href.match ( /action_type=raidhelp/ ) ) {
var hash = '';
var id = '';
href = href.replace ( /^.*\?/, '' );
var parts = href.split ( "&" );
/**
*
* @param {Array} parts
* @param {string} prefix
* @returns {null|string}
*/
var getData = function ( parts, prefix ) {
for (var count = 0; count < parts.length; count++) {
if ( parts[count].match ( 'raid_id=' ) ) {
id = parts[count].split ( '=' )[1];
} else if ( parts[count].match ( 'hash=' ) ) {
hash = parts[count].split ( '=' )[1];
} else if ( parts[count].match ( 'serverid=2' ) && !idrinth.settings.get ( "world" ) ) {
return;
} else if ( !parts[count].match ( 'server_id=2' ) && idrinth.settings.get ( "world" ) ) {
return;
if ( parts[count].match ( prefix + '=' ) ) {
return parts[count].split ( '=' )[1];
}
}
if ( !id || !hash ) {
return;
return null;
};
/**
*
* @param {string} href
* @param {Boolean} isWorld
* @returns {Boolean}
*/
var correctServer = function ( href, isWorld ) {
if ( href.match ( 'serverid=2' ) ) {
return isWorld;
}
idrinth.raids.private[id] = hash;
idrinth.core.ajax.runHome ( 'get-raid-service/' + id + '/' + hash + '/' );
return !isWorld;
};
if ( !href || !href.match ( /action_type=raidhelp/ ) ) {
return;
}
href = href.replace ( /^.*\?/, '' );
if ( !correctServer ( href, idrinth.settings.get ( "world" ) ) ) {
return;
}
var parts = href.split ( "&" );
var id = getData ( parts, 'raid_id' );
var hash = getData ( parts, 'hash' );
if ( !id || !hash ) {
return;
}
idrinth.raids.private[id] = hash;
idrinth.core.ajax.runHome ( 'get-raid-service/' + id + '/' + hash + '/' );
};
if ( node.tagName === 'A' || node.tagName === 'a' ) {
handleLink ( node );
Expand Down
10 changes: 10 additions & 0 deletions src/mods/settings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,16 @@ idrinth.settings = {
* @type Boolean
*/
message: true,
/**
*
* @type Boolean
*/
content: true,
/**
*
* @type Boolean
*/
image: true,
/**
*
* @type Boolean
Expand Down
84 changes: 64 additions & 20 deletions src/mods/tier.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,28 +185,71 @@ idrinth.tier = {
*/
var makeField = function ( listKey, difficulty, ic ) {
var ln = {
type: 'td'
type: 'td',
attributes: [ ]
};
if (
idrinth.tier.list[listKey].hasOwnProperty ( 'loot' ) &&
idrinth.tier.list[listKey].loot.hasOwnProperty ( difficulty ) &&
idrinth.tier.list[listKey].loot[difficulty].hasOwnProperty ( ic ) &&
idrinth.tier.list[listKey].loot[difficulty][ic]
) {
ln.attributes = ln.attributes?ln.attributes:[];
/**
*
* @param {object} ln
* @param {string} listKey
* @param {string} difficulty
* @param {string} ic
* @returns {object} for the buildElement wrapper
*/
var addTitle = function ( ln, listKey, difficulty, ic ) {
/**
*
* @param {string} listKey
* @param {string} difficulty
* @param {string} ic
* @returns {Boolean}
*/
var isUseable = function ( listKey, difficulty, ic ) {
return idrinth.tier.list[listKey].hasOwnProperty ( 'loot' ) &&
idrinth.tier.list[listKey].loot.hasOwnProperty ( difficulty ) &&
idrinth.tier.list[listKey].loot[difficulty].hasOwnProperty ( ic ) &&
idrinth.tier.list[listKey].loot[difficulty][ic];
};
if ( !isUseable ( listKey, difficulty, ic ) ) {
return ln;
}
var title = "";
for(var key in idrinth.tier.list[listKey].loot[difficulty][ic]) {
if(idrinth.tier.list[listKey].loot[difficulty][ic].hasOwnProperty (key)) {
title += idrinth.tier.list[listKey].loot[difficulty][ic][key]+" "+idrinth.text.get ('tier.loot.'+key)+"\n";
for (var key in idrinth.tier.list[listKey].loot[difficulty][ic]) {
if ( idrinth.tier.list[listKey].loot[difficulty][ic].hasOwnProperty ( key ) ) {
title += idrinth.tier.list[listKey].loot[difficulty][ic][key] + " " + idrinth.text.get ( 'tier.loot.' + key ) + "\n";
}
}
ln.attributes.push({name:'title',value:title});
}
if (
idrinth.tier.list[listKey].hasOwnProperty ( difficulty ) &&
idrinth.tier.list[listKey][difficulty].hasOwnProperty ( ic )
) {
ln.styles = idrinth.tier.list[listKey].os[difficulty] === idrinth.tier.list[listKey][difficulty][ic] ? 'is-os' : '';
ln.attributes.push ( {
name: 'title',
value: title
} );
return ln;
};
/**
*
* @param {object} ln
* @param {string} listKey
* @param {string} difficulty
* @param {string} ic
* @returns {object} for the buildElement wrapper
*/
var addContent = function ( ln, listKey, difficulty, ic ) {
/**
*
* @param {string} os numeric string
* @param {string} current numeric string
* @returns {Boolean}
*/
var isOs = function ( os, current ) {
return Number.parseInt ( os, 10 ) === Number.parseInt ( current, 10 );
};
if (
!idrinth.tier.list[listKey].hasOwnProperty ( difficulty ) ||
!idrinth.tier.list[listKey][difficulty].hasOwnProperty ( ic )
) {
return ln;
}
ln.css = isOs ( idrinth.tier.list[listKey].os[difficulty], idrinth.tier.list[listKey][difficulty][ic] ) ? 'is-os' : '';
ln.content = idrinth.ui.formatNumber ( idrinth.tier.list[listKey][difficulty][ic] );
if (
idrinth.tier.list[listKey].epics &&
Expand All @@ -215,8 +258,9 @@ idrinth.tier = {
) {
ln.content += ' ' + idrinth.tier.list[listKey].epics[difficulty][ic] + 'E';
}
}
return ln;
return ln;
};
return addContent ( addTitle ( ln, listKey, difficulty, ic ), listKey, difficulty, ic );
};
/**
*
Expand Down
10 changes: 10 additions & 0 deletions src/mods/ui.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -744,6 +744,16 @@ idrinth.ui = {
rType: '#input',
type: 'checkbox',
label: 'chat.notification.message'
}, {
name: 'notification#content',
rType: '#input',
type: 'checkbox',
label: 'chat.notification.content'
}, {
name: 'notification#image',
rType: '#input',
type: 'checkbox',
label: 'chat.notification.image'
} ], 'chat' ),
{
css: 'idrinth-line',
Expand Down