Merge pull request #785 from GrosPoulet/master

New option + new imgs details
extesy · Aug 28, 2021 · a727cc3 · a727cc3
2 parents 1d5629e + 9238e7a
commit a727cc3
Show file tree

Hide file tree

Showing 7 changed files with 273 additions and 141 deletions.
diff --git a/_locales/en/messages.json b/_locales/en/messages.json
@@ -147,6 +147,14 @@
         "message": "If unchecked, zoomed images will be resized dynamically",
         "description": "[options] Tooltip for extend zoomed images below the mouse cursor option"
     },
+    "optHideMouseCursor": {
+    	"message": "Hide mouse cursor after:",
+    	"description": "[options] Hide mouse cursor option"
+    },
+    "optHideMouseCursorTooltip": {
+    	"message": "If checked, mouse cursor will be hidden after delay",
+    	"description": "[options] Tooltip for hide mouse cursor option"
+    },
     "optPageActionEnabled": {
         "message": "Show icon in address bar",
         "description": "[options] Show icon in address bar option"

diff --git a/css/style.css b/css/style.css
@@ -56,3 +56,7 @@ select.picker {
     pointer-events: none;
     opacity: 0.5;
 }
+
+legend {
+    font-weight: bold;
+}
diff --git a/html/options.html b/html/options.html
@@ -267,6 +267,15 @@ <h1 class="ten columns text-center" data-i18n="optTitle"></h1>
                                         <input class="xnarrow text input" type="text" id="txtFadeDuration"><span class="adjoined xnarrow" data-i18n="optDurationUnitName"></span>
                                     </label>
                                 </li>
+                                <div class="ttip" data-i18n-tooltip="optHideMouseCursorTooltip">
+                                    <li class="append field">
+                                        <label class="checkbox inline" style="padding-right:10px" for="chkHideMouseCursor">
+                                            <input type="checkbox" id="chkHideMouseCursor"><span></span>
+                                            <div style="display:inline" data-i18n="optHideMouseCursor"></div>
+                                        </label>
+                                        <div id="divHideMouseCursor" style="display:inline"><input class="xnarrow text input" type="text" id="txtHideMouseCursor"><span class="adjoined xnarrow" data-i18n="optDurationUnitName"></span></div>
+                                    </li>
+                                </div>
                             </ul>
                         </fieldset>
                     </form>

diff --git a/js/background.js b/js/background.js
@@ -5,20 +5,27 @@ function ajaxRequest(request, callback) {
 
     var xhr = new XMLHttpRequest();
     var response = request.response;
+    var method = request.method;
+    var url = request.url;
     xhr.onreadystatechange = function () {
+
         if (xhr.readyState == 4) {
             if (xhr.status == 200) {
-                if (response === 'URL') {
-                    callback(xhr.responseURL);
-                }
-                else {
-                    callback(xhr.responseText);
+                if (method == 'HEAD') {
+                    callback({url:url, headers:xhr.getAllResponseHeaders()});
+                } else {
+                    if (response === 'URL') {
+                        callback(xhr.responseURL);
+                    } else {
+                        callback(xhr.responseText);
+                    }
                 }
             } else {
                 callback(null);
             }
         }
     }
+
     xhr.open(request.method, request.url, true);
     for (var i in request.headers) {
         xhr.setRequestHeader(request.headers[i].header, request.headers[i].value);
@@ -42,6 +49,9 @@ function onMessage(message, sender, callback) {
         case 'ajaxGet':
             ajaxRequest({url:message.url, response:message.response, method:'GET'}, callback);
             return true;
+        case 'ajaxGetHeaders':
+            ajaxRequest({url:message.url, response:message.response, method:'HEAD'}, callback);
+            return true;
         case 'ajaxRequest':
             ajaxRequest(message, callback);
             return true;

diff --git a/js/common.js b/js/common.js
@@ -20,6 +20,8 @@ var factorySettings = {
     picturesOpacity : 1,
     showWhileLoading : true,
     mouseUnderlap : true,
+    hideMouseCursor : false,
+    hideMouseCursorDelay : 500,
     filterNSFW : false,
     enableGalleries : true,
     ambilightEnabled : false,
@@ -96,6 +98,8 @@ function loadOptions() {
     options.picturesOpacity = options.hasOwnProperty('picturesOpacity') ? options.picturesOpacity : factorySettings.picturesOpacity;
     options.showWhileLoading = options.hasOwnProperty('showWhileLoading') ? options.showWhileLoading : factorySettings.showWhileLoading;
     options.mouseUnderlap = options.hasOwnProperty('mouseUnderlap') ? options.mouseUnderlap : factorySettings.mouseUnderlap;
+    options.hideMouseCursor = options.hasOwnProperty('hideMouseCursor') ? options.hideMouseCursor : factorySettings.hideMouseCursor;
+    options.hideMouseCursorDelay = options.hasOwnProperty('hideMouseCursorDelay') ? options.hideMouseCursorDelay : factorySettings.hideMouseCursorDelay;
     options.filterNSFW = options.hasOwnProperty('filterNSFW') ? options.filterNSFW : factorySettings.filterNSFW;
     options.enableGalleries = options.hasOwnProperty('enableGalleries') ? options.enableGalleries : factorySettings.enableGalleries;
     options.ambilightEnabled = options.hasOwnProperty('ambilightEnabled') ? options.ambilightEnabled : factorySettings.ambilightEnabled;