phillip/ingress-intel-total-conversion
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Privacy view: accesskey (9) + fixes

Browse Source 
- collapse chat before entering privacy view
- don't allow chat to expand when in privacy view
- disallow pointer events for the leaflet-control placeholder so ic can be clicked through
This commit is contained in:
fkloft 2014-07-03 19:07:11 +02:00
parent c6392acb36
commit c6a6dc3105
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
code/boot.js
View File

@ -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 // TODO? move the actual IITC DOM into the leaflet control areas, so dummy <div>s aren't needed
if(!isSmartphone()) { if(!isSmartphone()) {
// chat window area // 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 = {}; var addLayers = {};

8
plugins/privacy-view.user.js
View File

@ -1,7 +1,7 @@
// ==UserScript== // ==UserScript==
// @id iitc-plugin-privacy-view@Scrool // @id iitc-plugin-privacy-view@Scrool
// @name IITC plugin: Privacy view on Intel // @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 // @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. // @description [@@BUILDNAME@@-@@BUILDDATE@@] Hide info from intel which shouldn't leak to players of the other faction.
// @updateURL @@UPDATEURL@@ // @updateURL @@UPDATEURL@@
@ -25,6 +25,8 @@ window.plugin.privacyView.chatExpanded = function() {
}; };
window.plugin.privacyView.toggle = function() { window.plugin.privacyView.toggle = function() {
if($('#chat').hasClass('expand')) window.plugin.privacyView.wrapChatToggle();
var b = $('body'); var b = $('body');
var t = $('#privacycontrols .toggle'); var t = $('#privacycontrols .toggle');
if(b.hasClass('privacy_active')) { if(b.hasClass('privacy_active')) {
@ -40,6 +42,8 @@ window.plugin.privacyView.toggle = function() {
}; };
window.plugin.privacyView.wrapChatToggle = function() { window.plugin.privacyView.wrapChatToggle = function() {
if($(document.body).hasClass('privacy_active')) return;
window.chat.toggle(); window.chat.toggle();
var c = $('#chat, #chatcontrols'); var c = $('#chat, #chatcontrols');
if(c.hasClass('expand')) { if(c.hasClass('expand')) {
@ -99,7 +103,7 @@ window.plugin.privacyView.setup = function() {
$('#chatcontrols a:first').click(window.plugin.privacyView.wrapChatToggle); $('#chatcontrols a:first').click(window.plugin.privacyView.wrapChatToggle);
$('#chatcontrols').before('<div id="privacycontrols" class="shrinked">' + $('#chatcontrols').before('<div id="privacycontrols" class="shrinked">' +
' <a><span class="toggle"></span></a>' + ' <a accesskey="9"><span class="toggle"></span></a>' +
'</div>'); '</div>');
$('#privacycontrols a').click(window.plugin.privacyView.toggle); $('#privacycontrols a').click(window.plugin.privacyView.toggle);