summaryrefslogtreecommitdiffstats
path: root/webclients/novnc/include/webutil.js
diff options
context:
space:
mode:
Diffstat (limited to 'webclients/novnc/include/webutil.js')
-rw-r--r--webclients/novnc/include/webutil.js181
1 files changed, 136 insertions, 45 deletions
diff --git a/webclients/novnc/include/webutil.js b/webclients/novnc/include/webutil.js
index 6722fe3..e674bf9 100644
--- a/webclients/novnc/include/webutil.js
+++ b/webclients/novnc/include/webutil.js
@@ -1,13 +1,13 @@
/*
* noVNC: HTML5 VNC client
* Copyright (C) 2012 Joel Martin
- * Licensed under LGPL-3 (see LICENSE.txt)
+ * Copyright (C) 2013 NTT corp.
+ * Licensed under MPL 2.0 (see LICENSE.txt)
*
* See README.md for usage and integration instructions.
*/
-"use strict";
-/*jslint bitwise: false, white: false */
+/*jslint bitwise: false, white: false, browser: true, devel: true */
/*global Util, window, document */
// Globals defined here
@@ -30,43 +30,47 @@ if (!window.$D) {
}
-/*
+/*
* ------------------------------------------------------
* Namespaced in WebUtil
* ------------------------------------------------------
*/
// init log level reading the logging HTTP param
-WebUtil.init_logging = function() {
- Util._log_level = (document.location.href.match(
- /logging=([A-Za-z0-9\._\-]*)/) ||
- ['', Util._log_level])[1];
-
+WebUtil.init_logging = function (level) {
+ "use strict";
+ if (typeof level !== "undefined") {
+ Util._log_level = level;
+ } else {
+ var param = document.location.href.match(/logging=([A-Za-z0-9\._\-]*)/);
+ Util._log_level = (param || ['', Util._log_level])[1];
+ }
Util.init_logging();
};
-WebUtil.init_logging();
WebUtil.dirObj = function (obj, depth, parent) {
- var i, msg = "", val = "";
- if (! depth) { depth=2; }
- if (! parent) { parent= ""; }
-
- // Print the properties of the passed-in object
- for (i in obj) {
- if ((depth > 1) && (typeof obj[i] === "object")) {
+ "use strict";
+ if (! depth) { depth = 2; }
+ if (! parent) { parent = ""; }
+
+ // Print the properties of the passed-in object
+ var msg = "";
+ for (var i in obj) {
+ if ((depth > 1) && (typeof obj[i] === "object")) {
// Recurse attributes that are objects
- msg += WebUtil.dirObj(obj[i], depth-1, parent + "." + i);
+ msg += WebUtil.dirObj(obj[i], depth - 1, parent + "." + i);
} else {
//val = new String(obj[i]).replace("\n", " ");
+ var val = "";
if (typeof(obj[i]) === "undefined") {
val = "undefined";
} else {
val = obj[i].toString().replace("\n", " ");
}
if (val.length > 30) {
- val = val.substr(0,30) + "...";
- }
+ val = val.substr(0, 30) + "...";
+ }
msg += parent + "." + i + ": " + val + "\n";
}
}
@@ -74,10 +78,16 @@ WebUtil.dirObj = function (obj, depth, parent) {
};
// Read a query string variable
-WebUtil.getQueryVar = function(name, defVal) {
- var re = new RegExp('[?][^#]*' + name + '=([^&#]*)');
+WebUtil.getQueryVar = function (name, defVal) {
+ "use strict";
+ var re = new RegExp('.*[?&]' + name + '=([^&#]*)'),
+ match = document.location.href.match(re);
if (typeof defVal === 'undefined') { defVal = null; }
- return (document.location.href.match(re) || ['',defVal])[1];
+ if (match) {
+ return decodeURIComponent(match[1]);
+ } else {
+ return defVal;
+ }
};
@@ -86,39 +96,118 @@ WebUtil.getQueryVar = function(name, defVal) {
*/
// No days means only for this browser session
-WebUtil.createCookie = function(name,value,days) {
+WebUtil.createCookie = function (name, value, days) {
+ "use strict";
var date, expires;
if (days) {
date = new Date();
- date.setTime(date.getTime()+(days*24*60*60*1000));
- expires = "; expires="+date.toGMTString();
- }
- else {
+ date.setTime(date.getTime() + (days * 24 * 60 * 60 * 1000));
+ expires = "; expires=" + date.toGMTString();
+ } else {
expires = "";
}
- document.cookie = name+"="+value+expires+"; path=/";
+
+ var secure;
+ if (document.location.protocol === "https:") {
+ secure = "; secure";
+ } else {
+ secure = "";
+ }
+ document.cookie = name + "=" + value + expires + "; path=/" + secure;
};
-WebUtil.readCookie = function(name, defaultValue) {
- var i, c, nameEQ = name + "=", ca = document.cookie.split(';');
- for(i=0; i < ca.length; i += 1) {
- c = ca[i];
- while (c.charAt(0) === ' ') { c = c.substring(1,c.length); }
- if (c.indexOf(nameEQ) === 0) { return c.substring(nameEQ.length,c.length); }
+WebUtil.readCookie = function (name, defaultValue) {
+ "use strict";
+ var nameEQ = name + "=",
+ ca = document.cookie.split(';');
+
+ for (var i = 0; i < ca.length; i += 1) {
+ var c = ca[i];
+ while (c.charAt(0) === ' ') { c = c.substring(1, c.length); }
+ if (c.indexOf(nameEQ) === 0) { return c.substring(nameEQ.length, c.length); }
}
return (typeof defaultValue !== 'undefined') ? defaultValue : null;
};
-WebUtil.eraseCookie = function(name) {
- WebUtil.createCookie(name,"",-1);
+WebUtil.eraseCookie = function (name) {
+ "use strict";
+ WebUtil.createCookie(name, "", -1);
+};
+
+/*
+ * Setting handling.
+ */
+
+WebUtil.initSettings = function (callback /*, ...callbackArgs */) {
+ "use strict";
+ var callbackArgs = Array.prototype.slice.call(arguments, 1);
+ if (window.chrome && window.chrome.storage) {
+ window.chrome.storage.sync.get(function (cfg) {
+ WebUtil.settings = cfg;
+ console.log(WebUtil.settings);
+ if (callback) {
+ callback.apply(this, callbackArgs);
+ }
+ });
+ } else {
+ // No-op
+ if (callback) {
+ callback.apply(this, callbackArgs);
+ }
+ }
+};
+
+// No days means only for this browser session
+WebUtil.writeSetting = function (name, value) {
+ "use strict";
+ if (window.chrome && window.chrome.storage) {
+ //console.log("writeSetting:", name, value);
+ if (WebUtil.settings[name] !== value) {
+ WebUtil.settings[name] = value;
+ window.chrome.storage.sync.set(WebUtil.settings);
+ }
+ } else {
+ localStorage.setItem(name, value);
+ }
+};
+
+WebUtil.readSetting = function (name, defaultValue) {
+ "use strict";
+ var value;
+ if (window.chrome && window.chrome.storage) {
+ value = WebUtil.settings[name];
+ } else {
+ value = localStorage.getItem(name);
+ }
+ if (typeof value === "undefined") {
+ value = null;
+ }
+ if (value === null && typeof defaultValue !== undefined) {
+ return defaultValue;
+ } else {
+ return value;
+ }
+};
+
+WebUtil.eraseSetting = function (name) {
+ "use strict";
+ if (window.chrome && window.chrome.storage) {
+ window.chrome.storage.sync.remove(name);
+ delete WebUtil.settings[name];
+ } else {
+ localStorage.removeItem(name);
+ }
};
/*
* Alternate stylesheet selection
*/
-WebUtil.getStylesheets = function() { var i, links, sheets = [];
- links = document.getElementsByTagName("link");
- for (i = 0; i < links.length; i += 1) {
+WebUtil.getStylesheets = function () {
+ "use strict";
+ var links = document.getElementsByTagName("link");
+ var sheets = [];
+
+ for (var i = 0; i < links.length; i += 1) {
if (links[i].title &&
links[i].rel.toUpperCase().indexOf("STYLESHEET") > -1) {
sheets.push(links[i]);
@@ -129,14 +218,16 @@ WebUtil.getStylesheets = function() { var i, links, sheets = [];
// No sheet means try and use value from cookie, null sheet used to
// clear all alternates.
-WebUtil.selectStylesheet = function(sheet) {
- var i, link, sheets = WebUtil.getStylesheets();
+WebUtil.selectStylesheet = function (sheet) {
+ "use strict";
if (typeof sheet === 'undefined') {
sheet = 'default';
}
- for (i=0; i < sheets.length; i += 1) {
- link = sheets[i];
- if (link.title === sheet) {
+
+ var sheets = WebUtil.getStylesheets();
+ for (var i = 0; i < sheets.length; i += 1) {
+ var link = sheets[i];
+ if (link.title === sheet) {
Util.Debug("Using stylesheet " + sheet);
link.disabled = false;
} else {
generated by cgit v1.2.1 (git 2.18.0) at 2025-02-08 16:43:26 +0000