Skip to content
This repository has been archived by the owner on Nov 15, 2017. It is now read-only.

Commit

Permalink
changes for #255, #81
Browse files Browse the repository at this point in the history
  • Loading branch information
gorhill committed May 8, 2014
1 parent f2dfaee commit 61615fb
Show file tree
Hide file tree
Showing 20 changed files with 736 additions and 195 deletions.
12 changes: 12 additions & 0 deletions _locales/de/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,18 @@
"message": "Reload the page.",
"description": "Tool tip for the reload button"
},
"matrixPresetMoreReadTip" : {
"message": "Export a recipe: Temporary rules \u000a of current scope will be encoded \u000a as a recipe",
"description": "English: Export a recipe: Temporary rules \u000a of current scope will be encoded \u000a as a recipe"
},
"matrixPresetMoreWriteTip" : {
"message": "Import a recipe: Temporary rules \u000a will be created into current scope",
"description": "English: Import a recipe: Temporary rules \u000a will be created into current scope"
},
"matrixPresetMoreRecipeTip" : {
"message": "Users can exchange recipes here to help each other. Usual warnings about untrusted sources apply.",
"description": "English: Users can exchange recipes here to help each other. Usual warnings about untrusted sources apply."
},


"statsPageTitle" : {
Expand Down
12 changes: 12 additions & 0 deletions _locales/en/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,18 @@
"message": "Reload the page.",
"description": "Tool tip for the reload button"
},
"matrixPresetMoreReadTip" : {
"message": "Export a recipe: Temporary rules \u000a of current scope will be encoded \u000a as a recipe",
"description": "English: Export a recipe: Temporary rules \u000a of current scope will be encoded \u000a as a recipe"
},
"matrixPresetMoreWriteTip" : {
"message": "Import a recipe: Temporary rules \u000a will be created into current scope",
"description": "English: Import a recipe: Temporary rules \u000a will be created into current scope"
},
"matrixPresetMoreRecipeTip" : {
"message": "Users can exchange recipes here to help each other. Usual warnings about untrusted sources apply.",
"description": "English: Users can exchange recipes here to help each other. Usual warnings about untrusted sources apply."
},


"statsPageTitle" : {
Expand Down
12 changes: 12 additions & 0 deletions _locales/fr/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,18 @@
"message": "Actualiser la page",
"description": "Tool tip for the reload button"
},
"matrixPresetMoreReadTip" : {
"message": "Exporter une recette: Les règles \u000a temporaires du contexte actuel \u000a seront utilisées pour créer une recette",
"description": "English: Export a recipe: Temporary rules \u2013 visible or \u000a not \u2013 of current scope will be encoded\u000a as a recipe"
},
"matrixPresetMoreWriteTip" : {
"message": "Importer une recette: Les règles \u000a temporaires seront importées \u000a dans le contexte actuel.",
"description": "English: Import a recipe: Temporary rules \u2013 visible or \u000a not \u2013 will be created into current scope"
},
"matrixPresetMoreRecipeTip" : {
"message": "Les utilisateurs peuvent s'entraider en échangant des recettes ici.",
"description": "English: Users can exchange recipes here to help each other. Usual warnings about untrusted sources apply."
},


"statsPageTitle" : {
Expand Down
1 change: 1 addition & 0 deletions background.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
<script src="js/storage.js"></script>
<script src="js/pagestats.js"></script>
<script src="js/tab.js"></script>
<script src="js/reciper.js"></script>
<script src="js/traffic.js"></script>
<script src="js/uritools.js"></script>
<script src="js/useragent.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions css/common.css
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,10 @@
border-radius: 3px;
box-shadow: 1px 1px 3px gray;
}
.alignLeft *[data-tip]:hover:after {
.tip-anchor-left[data-tip]:hover:after {
left: 0;
}
.alignRight *[data-tip]:hover:after {
.tip-anchor-right[data-tip]:hover:after {
right: 0;
}

37 changes: 37 additions & 0 deletions css/popup.css
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,44 @@ button.disabled > span.badge {
.presetEntry:hover {
background-color: #80e2ff;
}
#presetMore > *:first-child {
margin: 0;
padding: 0;
text-align: center;
color: #888;
cursor: pointer;
font-size: 13px;
}
#presetMore > *:first-child + div {
margin: 0.25em 0 0 0;
padding: 0.25em 0 0 0;
display: none;
text-align: center;
}
#presetMore > *:first-child + div.show {
display: block;
}
#presetMore > *:first-child + div > * {
vertical-align: middle;
}
#presetMoreRecipe {
border: 1px solid #aaa;
width: 75%;
height: 4em;
overflow: hidden;
resize: none;
font-size: 10px;
color: #888;
}
#presetMoreRecipe.bad {
border: 1px solid #fcc;
color: #aaa;
}
#presetMoreWrite.bad {
visibility: hidden;
}

/* I think this is obsolete */
.dropdown-menu > li > a > i {
padding: 0 6px;
font-size: 1.2em;
Expand Down
2 changes: 1 addition & 1 deletion js/about.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ var commitHistoryURLPrefix = 'https://github.com/gorhill/httpswitchboard/commits

var getHTTPSB = function() {
return chrome.extension.getBackgroundPage().HTTPSB;
}
};

/******************************************************************************/

Expand Down
2 changes: 1 addition & 1 deletion js/async.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
var now = Date.now();
var job;
for ( var jobName in jobs ) {
if ( !jobs.hasOwnProperty(jobName) ) {
if ( jobs.hasOwnProperty(jobName) === false ) {
continue;
}
job = jobs[jobName];
Expand Down
4 changes: 2 additions & 2 deletions js/background.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ var HTTPSB = {

userSettings: {
autoWhitelistPageDomain: false,
autoCreateScope: '',
autoCreateScope: 'domain',
clearBrowserCache: true,
clearBrowserCacheAfter: 60,
deleteCookies: false,
deleteUnusedTemporaryScopes: false,
deleteUnusedTemporaryScopes: true,
deleteUnusedTemporaryScopesAfter: 30,
deleteUnusedSessionCookies: false,
deleteUnusedSessionCookiesAfter: 60,
Expand Down
Loading

0 comments on commit 61615fb

Please sign in to comment.