Mirrors
/
uBlock
mirror of https://github.com/gorhill/uBlock.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix #1510

This commit is contained in:
gorhill 2017-09-21 11:46:15 -04:00
parent e3c4d4d7fe
commit ac481ec1f2
No known key found for this signature in database
GPG Key ID: 25E1490B761470C2
3 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/cloud-ui.html
View File

@ -7,8 +7,9 @@
<body> <body>
<button id="cloudPush" type="button" title="cloudPush"></button> <button id="cloudPush" type="button" title="cloudPush"></button>
<span data-i18n="cloudNoData"></span> <span data-i18n="cloudNoData"></span>
<button id="cloudPull" type="button" title="cloudPull" disabled></button>&nbsp; <button id="cloudPull" type="button" title="cloudPull" disabled></button>
<button id="cloudPullAndMerge" type="button" title="cloudPullAndMerge" disabled></button> <button id="cloudPullAndMerge" type="button" title="cloudPullAndMerge" disabled></button>
<p id="cloudError"><span></span></p>
<span id="cloudCog" class="fa">&#xf013;</span> <span id="cloudCog" class="fa">&#xf013;</span>
<div id="cloudOptions"> <div id="cloudOptions">
<div> <div>

16
src/css/cloud-ui.css
View File

@ -2,7 +2,7 @@
background: url("../img/cloud.png") hsl(216, 100%, 93%); background: url("../img/cloud.png") hsl(216, 100%, 93%);
border-radius: 3px; border-radius: 3px;
margin: 0.5em 0; margin: 0.5em 0;
padding: 1em; padding: 1em 1em 0 1em;
position: relative; position: relative;
} }
#cloudWidget.hide { #cloudWidget.hide {
@ -22,6 +22,9 @@
#cloudWidget > button[disabled] { #cloudWidget > button[disabled] {
visibility: hidden; visibility: hidden;
} }
#cloudWidget > button.error {
color: red;
}
#cloudPush:after { #cloudPush:after {
content: '\f0ee'; content: '\f0ee';
} }
@ -29,6 +32,9 @@
#cloudPullAndMerge:before { #cloudPullAndMerge:before {
content: '\f0ed'; content: '\f0ed';
} }
#cloudPullAndMerge {
margin: 0 0.25em;
}
#cloudPullAndMerge:after { #cloudPullAndMerge:after {
content: '\f067'; content: '\f067';
font-size: 50%; font-size: 50%;
@ -45,7 +51,13 @@
vertical-align: bottom; vertical-align: bottom;
white-space: pre; white-space: pre;
} }
#cloudWidget > .nodata { #cloudError {
color: red;
margin: 0;
padding: 0.5em 0;
}
#cloudError > span {
font-size: x-small;
} }
#cloudWidget > #cloudCog { #cloudWidget > #cloudCog {
cursor: pointer; cursor: pointer;

16
src/js/cloud-ui.js
View File

@ -1,7 +1,7 @@
/******************************************************************************* /*******************************************************************************
uBlock Origin - a browser extension to block requests. uBlock Origin - a browser extension to block requests.
Copyright (C) 2015-2016 Raymond Hill Copyright (C) 2015-2017 Raymond Hill
This program is free software: you can redistribute it and/or modify This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@ -54,7 +54,7 @@ var messaging = vAPI.messaging;
/******************************************************************************/ /******************************************************************************/
var onCloudDataReceived = function(entry) { var onCloudDataReceived = function(entry) {
if ( typeof entry !== 'object' || entry === null ) { if ( entry instanceof Object === false ) {
return; return;
} }
@ -106,7 +106,15 @@ var pushData = function() {
datakey: self.cloud.datakey, datakey: self.cloud.datakey,
data: self.cloud.onPush() data: self.cloud.onPush()
}, },
fetchCloudData function(error) {
var failed = typeof error === 'string';
document.getElementById('cloudPush')
.classList
.toggle('error', failed);
document.querySelector('#cloudError > span')
.textContent = failed ? error : '';
fetchCloudData();
}
); );
}; };
@ -149,7 +157,7 @@ var closeOptions = function(ev) {
var submitOptions = function() { var submitOptions = function() {
var onOptions = function(options) { var onOptions = function(options) {
if ( typeof options !== 'object' || options === null ) { if ( options instanceof Object === false ) {
return; return;
} }
self.cloud.options = options; self.cloud.options = options;