Merge branch 'master' of https://github.com/jonatkins/ingress-intel-total-conversion
This commit is contained in:
Jon Atkins
commit
754e733852
@ -159,7 +159,8 @@ window.setupMap = function() {
|
||||
// TODO? move the actual IITC DOM into the leaflet control areas, so dummy <div>s aren't needed
|
||||
if(!isSmartphone()) {
|
||||
// chat window area
|
||||
$(window.map._controlCorners['bottomleft']).append($('<div>').width(708).height(108).addClass('leaflet-control').css('margin','0'));
|
||||
$(window.map._controlCorners['bottomleft']).append(
|
||||
$('<div>').width(708).height(108).addClass('leaflet-control').css({'pointer-events': 'none', 'margin': '0'}));
|
||||
}
|
||||
|
||||
var addLayers = {};
|
||||
|
||||
10
main.js
10
main.js
@ -70,8 +70,8 @@ document.getElementsByTagName('head')[0].innerHTML = ''
|
||||
document.getElementsByTagName('body')[0].innerHTML = ''
|
||||
+ '<div id="map">Loading, please wait</div>'
|
||||
+ '<div id="chatcontrols" style="display:none">'
|
||||
+ ' <a><span class="toggle expand"></span></a>'
|
||||
+ '<a>full</a><a>compact</a><a>public</a><a class="active">faction</a>'
|
||||
+ ' <a accesskey="0"><span class="toggle expand"></span></a>'
|
||||
+ '<a accesskey="1">full</a><a accesskey="2">compact</a><a accesskey="3">public</a><a accesskey="4" class="active">faction</a>'
|
||||
+ '</div>'
|
||||
+ '<div id="chat" style="display:none">'
|
||||
+ ' <div id="chatfaction"></div>'
|
||||
@ -82,15 +82,15 @@ document.getElementsByTagName('body')[0].innerHTML = ''
|
||||
+ '<form id="chatinput" style="display:none"><table><tr>'
|
||||
+ ' <td><time></time></td>'
|
||||
+ ' <td><mark>tell faction:</mark></td>'
|
||||
+ ' <td><input id="chattext" type="text" maxlength="256" /></td>'
|
||||
+ ' <td><input id="chattext" type="text" maxlength="256" accesskey="c" /></td>'
|
||||
+ '</tr></table></form>'
|
||||
+ '<a id="sidebartoggle"><span class="toggle close"></span></a>'
|
||||
+ '<a id="sidebartoggle" accesskey="i"><span class="toggle close"></span></a>'
|
||||
+ '<div id="scrollwrapper">' // enable scrolling for small screens
|
||||
+ ' <div id="sidebar" style="display: none">'
|
||||
+ ' <div id="playerstat">t</div>'
|
||||
+ ' <div id="gamestat"> loading global control stats</div>'
|
||||
+ ' <div id="geosearchwrapper">'
|
||||
+ ' <input id="geosearch" placeholder="Search location…" type="text"/>'
|
||||
+ ' <input id="geosearch" placeholder="Search location…" type="text" accesskey="f"/>'
|
||||
+ ' <img src="@@INCLUDEIMAGE:images/current-location.png@@"/ title="Current Location">'
|
||||
+ ' </div>'
|
||||
+ ' <div id="portaldetails"></div>'
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
// @id iitc-plugin-bookmarks@ZasoGD
|
||||
// @name IITC plugin: Bookmarks for maps and portals
|
||||
// @category Controls
|
||||
// @version 0.2.10.@@DATETIMEVERSION@@
|
||||
// @version 0.2.11.@@DATETIMEVERSION@@
|
||||
// @namespace https://github.com/jonatkins/ingress-intel-total-conversion
|
||||
// @updateURL @@UPDATEURL@@
|
||||
// @downloadURL @@DOWNLOADURL@@
|
||||
@ -1055,10 +1055,7 @@
|
||||
}
|
||||
|
||||
window.plugin.bookmarks.setupContent = function() {
|
||||
var ttt = '\'switch\'';
|
||||
if(!window.plugin.bookmarks.isSmart) { ttt = 1; }
|
||||
|
||||
plugin.bookmarks.htmlBoxTrigger = '<a id="bkmrksTrigger" class="open" onclick="window.plugin.bookmarks.switchStatusBkmrksBox('+ttt+');return false;">[-] Bookmarks</a>';
|
||||
plugin.bookmarks.htmlBoxTrigger = '<a id="bkmrksTrigger" class="open" onclick="window.plugin.bookmarks.switchStatusBkmrksBox(\'switch\');return false;" accesskey="v">[-] Bookmarks</a>';
|
||||
plugin.bookmarks.htmlBkmrksBox = '<div id="bookmarksBox">'
|
||||
+'<div id="topBar">'
|
||||
+'<a id="bookmarksMin" class="btn" onclick="window.plugin.bookmarks.switchStatusBkmrksBox(0);return false;" title="Minimize">-</a>'
|
||||
@ -1087,8 +1084,8 @@
|
||||
+'</div>';
|
||||
|
||||
plugin.bookmarks.htmlDisabledMessage = '<div title="Your browser do not support localStorage">Plugin Bookmarks disabled*.</div>';
|
||||
plugin.bookmarks.htmlStar = '<a class="bkmrksStar" onclick="window.plugin.bookmarks.switchStarPortal();return false;" title="Save this portal in your bookmarks"><span></span></a>';
|
||||
plugin.bookmarks.htmlCalldrawBox = '<a onclick="window.plugin.bookmarks.dialogDrawer();return false;" title="Draw lines/triangles between bookmarked portals">Auto draw</a>';
|
||||
plugin.bookmarks.htmlStar = '<a class="bkmrksStar" accesskey="b" onclick="window.plugin.bookmarks.switchStarPortal();return false;" title="Save this portal in your bookmarks"><span></span></a>';
|
||||
plugin.bookmarks.htmlCalldrawBox = '<a onclick="window.plugin.bookmarks.dialogDrawer();return false;" accesskey="q" title="Draw lines/triangles between bookmarked portals">Auto draw</a>';
|
||||
plugin.bookmarks.htmlCallSetBox = '<a onclick="window.plugin.bookmarks.manualOpt();return false;">Bookmarks Opt</a>';
|
||||
plugin.bookmarks.htmlMoveBtn = '<a id="bookmarksMove" class="btn" onclick="window.plugin.bookmarks.moveMode();return false;">Show/Hide "Move" button</a>'
|
||||
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
// @id iitc-plugin-draw-tools@breunigs
|
||||
// @name IITC plugin: draw tools
|
||||
// @category Layer
|
||||
// @version 0.6.2.@@DATETIMEVERSION@@
|
||||
// @version 0.6.3.@@DATETIMEVERSION@@
|
||||
// @namespace https://github.com/jonatkins/ingress-intel-total-conversion
|
||||
// @updateURL @@UPDATEURL@@
|
||||
// @downloadURL @@DOWNLOADURL@@
|
||||
@ -166,6 +166,34 @@ window.plugin.drawTools.addDrawControl = function() {
|
||||
|
||||
map.addControl(drawControl);
|
||||
//plugin.drawTools.addCustomButtons();
|
||||
|
||||
window.plugin.drawTools.setAccessKeys();
|
||||
for (var toolbarId in drawControl._toolbars) {
|
||||
if (drawControl._toolbars[toolbarId] instanceof L.Toolbar) {
|
||||
drawControl._toolbars[toolbarId].on('enable', function() {
|
||||
setTimeout(window.plugin.drawTools.setAccessKeys, 10);
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
window.plugin.drawTools.setAccessKeys = function() {
|
||||
// there is no API to add accesskeys, so have to dig in the DOM
|
||||
// must be same order as in markup. Note that each toolbar has a container for save/cancel
|
||||
var accessKeys = [
|
||||
'l', 'p', 'o', 'm', // line, polygon, circle, marker
|
||||
'a', // cancel (_abort)
|
||||
'e', 'd', // edit, delete
|
||||
's', 'a', // save, cancel
|
||||
];
|
||||
var buttons = window.plugin.drawTools.drawControl._container.getElementsByTagName('a');
|
||||
for(var i=0;i<buttons.length;i++) {
|
||||
if(!buttons[i].offsetParent) { // element hidden, delete accessKey (so other elements can use it)
|
||||
buttons[i].accessKey = '';
|
||||
} else if(accessKeys[i]) {
|
||||
buttons[i].accessKey = accessKeys[i];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -281,13 +309,13 @@ window.plugin.drawTools.manualOpt = function() {
|
||||
//TODO: add line style choosers: thickness, maybe dash styles?
|
||||
+ '</div>'
|
||||
+ '<div class="drawtoolsSetbox">'
|
||||
+ '<a onclick="window.plugin.drawTools.optCopy();">Copy Drawn Items</a>'
|
||||
+ '<a onclick="window.plugin.drawTools.optPaste();return false;">Paste Drawn Items</a>'
|
||||
+ '<a onclick="window.plugin.drawTools.optCopy();" tabindex="0">Copy Drawn Items</a>'
|
||||
+ '<a onclick="window.plugin.drawTools.optPaste();return false;" tabindex="0">Paste Drawn Items</a>'
|
||||
+ (window.requestFile != undefined
|
||||
? '<a onclick="window.plugin.drawTools.optImport();return false;">Import Drawn Items</a>' : '')
|
||||
? '<a onclick="window.plugin.drawTools.optImport();return false;" tabindex="0">Import Drawn Items</a>' : '')
|
||||
+ ((typeof android !== 'undefined' && android && android.saveFile)
|
||||
? '<a onclick="window.plugin.drawTools.optExport();return false;">Export Drawn Items</a>' : '')
|
||||
+ '<a onclick="window.plugin.drawTools.optReset();return false;">Reset Drawn Items</a>'
|
||||
? '<a onclick="window.plugin.drawTools.optExport();return false;" tabindex="0">Export Drawn Items</a>' : '')
|
||||
+ '<a onclick="window.plugin.drawTools.optReset();return false;" tabindex="0">Reset Drawn Items</a>'
|
||||
+ '</div>';
|
||||
|
||||
dialog({
|
||||
@ -440,7 +468,7 @@ window.plugin.drawTools.boot = function() {
|
||||
window.plugin.drawTools.save();
|
||||
});
|
||||
//add options menu
|
||||
$('#toolbox').append('<a onclick="window.plugin.drawTools.manualOpt();return false;">DrawTools Opt</a>');
|
||||
$('#toolbox').append('<a onclick="window.plugin.drawTools.manualOpt();return false;" accesskey="x">DrawTools Opt</a>');
|
||||
|
||||
$('head').append('<style>' +
|
||||
'.drawtoolsSetbox > a { display:block; color:#ffce00; border:1px solid #ffce00; padding:3px 0; margin:10px auto; width:80%; text-align:center; background:rgba(8,48,78,.9); }'+
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
// ==UserScript==
|
||||
// @id iitc-plugin-privacy-view@Scrool
|
||||
// @name IITC plugin: Privacy view on Intel
|
||||
// @version 1.0.0.@@DATETIMEVERSION@@
|
||||
// @version 1.0.1.@@DATETIMEVERSION@@
|
||||
// @namespace https://github.com/jonatkins/ingress-intel-total-conversion
|
||||
// @description [@@BUILDNAME@@-@@BUILDDATE@@] Hide info from intel which shouldn't leak to players of the other faction.
|
||||
// @updateURL @@UPDATEURL@@
|
||||
@ -25,6 +25,8 @@ window.plugin.privacyView.chatExpanded = function() {
|
||||
};
|
||||
|
||||
window.plugin.privacyView.toggle = function() {
|
||||
if($('#chat').hasClass('expand')) window.plugin.privacyView.wrapChatToggle();
|
||||
|
||||
var b = $('body');
|
||||
var t = $('#privacycontrols .toggle');
|
||||
if(b.hasClass('privacy_active')) {
|
||||
@ -40,6 +42,8 @@ window.plugin.privacyView.toggle = function() {
|
||||
};
|
||||
|
||||
window.plugin.privacyView.wrapChatToggle = function() {
|
||||
if($(document.body).hasClass('privacy_active')) return;
|
||||
|
||||
window.chat.toggle();
|
||||
var c = $('#chat, #chatcontrols');
|
||||
if(c.hasClass('expand')) {
|
||||
@ -99,7 +103,7 @@ window.plugin.privacyView.setup = function() {
|
||||
$('#chatcontrols a:first').click(window.plugin.privacyView.wrapChatToggle);
|
||||
|
||||
$('#chatcontrols').before('<div id="privacycontrols" class="shrinked">' +
|
||||
' <a><span class="toggle"></span></a>' +
|
||||
' <a accesskey="9"><span class="toggle"></span></a>' +
|
||||
'</div>');
|
||||
$('#privacycontrols a').click(window.plugin.privacyView.toggle);
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user