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

Merge pull request #672 from nexushoratio/to-push

Browse Source 
To push
This commit is contained in:
Jon Atkins 2013-12-02 09:57:25 -08:00
commit c5b93234a9
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/chat.js
View File

@ -106,7 +106,7 @@ window.chat.genPostData = function(isFaction, storageHash, getOlderMsgs) {
// Currently this edge case is not handled. Let’s see if this is a // Currently this edge case is not handled. Let’s see if this is a
// problem in crowded areas. // problem in crowded areas.
$.extend(data, {minTimestampMs: min}); $.extend(data, {minTimestampMs: min});
// when requesting with an acutal minimum timestamp, request oldest rather than newest first. // when requesting with an actual minimum timestamp, request oldest rather than newest first.
// this matches the stock intel site, and ensures no gaps when continuing after an extended idle period // this matches the stock intel site, and ensures no gaps when continuing after an extended idle period
if (min > -1) $.extend(data, {ascendingTimestampOrder: true}); if (min > -1) $.extend(data, {ascendingTimestampOrder: true});
} }

6
code/hooks.js
View File

@ -66,11 +66,11 @@ window.runHooks = function(event, data) {
if(VALID_HOOKS.indexOf(event) === -1) throw('Unknown event type: ' + event); if(VALID_HOOKS.indexOf(event) === -1) throw('Unknown event type: ' + event);
if(!_hooks[event]) return true; if(!_hooks[event]) return true;
var interupted = false; var interrupted = false;
$.each(_hooks[event], function(ind, callback) { $.each(_hooks[event], function(ind, callback) {
try { try {
if (callback(data) === false) { if (callback(data) === false) {
interupted = true; interrupted = true;
return false; //break from $.each return false; //break from $.each
} }
} catch(err) { } catch(err) {
@ -78,7 +78,7 @@ window.runHooks = function(event, data) {
debugger; debugger;
} }
}); });
return !interupted; return !interrupted;
} }

4
mobile/smartphone.css
View File

@ -198,14 +198,14 @@ body {
.linkdetails aside { .linkdetails aside {
padding: 5px; padding: 5px;
margin-top: 3px; margin-top: 3px;
margin-botton: 3px; margin-bottom: 3px;
border: 2px outset #0e3d4e; border: 2px outset #0e3d4e;
} }
#toolbox > a { #toolbox > a {
padding: 5px; padding: 5px;
margin-top: 3px; margin-top: 3px;
margin-botton: 3px; margin-bottom: 3px;
border: 2px outset #0e3d4e; border: 2px outset #0e3d4e;
} }