From 12ecd592ab136506c7a1514570b87284d0aa9148 Mon Sep 17 00:00:00 2001 From: Menithal Date: Thu, 24 Mar 2016 01:14:48 +0200 Subject: [PATCH 1/2] Added Refresh Buttons to entityProperties Pressing buttons next to the url bar will now allow for content to have an automatic unix timestamp to be applied / updated to the end of the url. Applies for all url entity Properties --- examples/html/entityProperties.html | 44 +++++++++++++++++++++++++++++ examples/html/style.css | 12 +++++++- 2 files changed, 55 insertions(+), 1 deletion(-) diff --git a/examples/html/entityProperties.html b/examples/html/entityProperties.html index e3eb19dc4a..3380623c66 100644 --- a/examples/html/entityProperties.html +++ b/examples/html/entityProperties.html @@ -451,6 +451,37 @@ var elPreviewCameraButton = document.getElementById("preview-camera-button"); + var urlUpdaters = document.getElementsByClassName("update-url-version"); + var PARAM_REGEXP = /(?:\?)(\S+)/; // Check if this has any parameters. + var TIMESTAMP_REGEXP = /(&?HFTime=\d+)/; + + var refreshEvent = function(event){ + var urlElement = event.target.parentElement.getElementsByClassName("url")[0]; + var content = urlElement.value; + var date = new Date(); + var timeStamp = date.getTime(); + + if(content.length > 0){ + if(PARAM_REGEXP.test(content)){ + // Has params, so lets remove existing definition and append again. + content = content.replace(TIMESTAMP_REGEXP,"") + "&"; + }else{ + content += "?"; + } + content = content.replace("?&","?"); + urlElement.value = content + "HFTime=" + timeStamp; + } + var evt = document.createEvent("HTMLEvents"); + evt.initEvent("change", true, true ); + urlElement.dispatchEvent(evt); + + }; + + for(var index = 0; index < urlUpdaters.length; index++){ + var urlUpdater = urlUpdaters[index]; + urlUpdater.addEventListener("click", refreshEvent); + } + if (window.EventBridge !== undefined) { var properties; EventBridge.scriptEventReceived.connect(function(data) { @@ -1185,6 +1216,7 @@
Ambient URL
+
@@ -1262,6 +1294,7 @@
Skybox URL
+
@@ -1273,6 +1306,7 @@
Source URL
+
@@ -1286,12 +1320,14 @@
Href - Hifi://address
+
Description
+
@@ -1375,16 +1411,19 @@
X-axis Texture URL
+
Y-axis Texture URL
+
Z-axis Texture URL
+
@@ -1566,6 +1605,7 @@
Collision Sound URL
+
@@ -1583,6 +1623,7 @@
+
@@ -1595,6 +1636,7 @@
Model URL
+
@@ -1613,12 +1655,14 @@
Compound Shape URL
+
Animation URL
+
diff --git a/examples/html/style.css b/examples/html/style.css index 83982dab15..3ae1c1739b 100644 --- a/examples/html/style.css +++ b/examples/html/style.css @@ -134,8 +134,18 @@ textarea { resize: vertical; } +.update-url-version{ + width:17px; + height:17px; + float:right; + background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABEAAAARCAQAAACRZI9xAAABAUlEQVQoz33RvyvEARjH8SdlUX6UbhFJfgwmE3aTxWEiitxqN/gH7IxCKTcymLiJFIOJsihiUKcrCYnuXoZv+F45n2d4lvfz6fPpCSFs6BO1JllvLmXk5F37dC0vJ5NGmlBxoFp7Rn6RDpRRtG5KtynrijhLoBBGQcllKkFWAXsyCbKEFxeGqmJmFZFLkE639vX+12hCSVft0nUR8RbLcRN/aSHGIqL2tVYPconL32qLtaiL88Rl0qtXc+pTDv1OPGMlidtgS8Wp2RR05FEFM98/GlRQ9mTHvB7jVt2rKGPAT9xh2z6qfnToHV1SjZpN23Tl051di1oco9W/pdttaBRfEhFXOZV7vEsAAAAASUVORK5CYII=); + padding:0 !important; + margin:0 2px 0 0 !important; +} + input.url { - width: 100%; + width:85%; + padding-right: 20px; } input.coord { From 24f2bdac7795ac5c3cb3fc3235f7821f031ba1be Mon Sep 17 00:00:00 2001 From: Menithal Date: Thu, 24 Mar 2016 20:58:32 +0200 Subject: [PATCH 2/2] Fixed Styling --- examples/html/entityProperties.html | 80 ++++++++++++++--------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/examples/html/entityProperties.html b/examples/html/entityProperties.html index 3380623c66..225a1d7957 100644 --- a/examples/html/entityProperties.html +++ b/examples/html/entityProperties.html @@ -451,36 +451,36 @@ var elPreviewCameraButton = document.getElementById("preview-camera-button"); - var urlUpdaters = document.getElementsByClassName("update-url-version"); - var PARAM_REGEXP = /(?:\?)(\S+)/; // Check if this has any parameters. - var TIMESTAMP_REGEXP = /(&?HFTime=\d+)/; - - var refreshEvent = function(event){ - var urlElement = event.target.parentElement.getElementsByClassName("url")[0]; - var content = urlElement.value; - var date = new Date(); - var timeStamp = date.getTime(); + var urlUpdaters = document.getElementsByClassName("update-url-version"); + var PARAM_REGEXP = /(?:\?)(\S+)/; // Check if this has any parameters. + var TIMESTAMP_REGEXP = /(&?HFTime=\d+)/; - if(content.length > 0){ - if(PARAM_REGEXP.test(content)){ - // Has params, so lets remove existing definition and append again. - content = content.replace(TIMESTAMP_REGEXP,"") + "&"; - }else{ - content += "?"; - } - content = content.replace("?&","?"); - urlElement.value = content + "HFTime=" + timeStamp; - } - var evt = document.createEvent("HTMLEvents"); - evt.initEvent("change", true, true ); - urlElement.dispatchEvent(evt); + var refreshEvent = function(event){ + var urlElement = event.target.parentElement.getElementsByClassName("url")[0]; + var content = urlElement.value; + var date = new Date(); + var timeStamp = date.getTime(); - }; + if(content.length > 0){ + if(PARAM_REGEXP.test(content)){ + // Has params, so lets remove existing definition and append again. + content = content.replace(TIMESTAMP_REGEXP,"") + "&"; + }else{ + content += "?"; + } + content = content.replace("?&","?"); + urlElement.value = content + "HFTime=" + timeStamp; + } - for(var index = 0; index < urlUpdaters.length; index++){ - var urlUpdater = urlUpdaters[index]; - urlUpdater.addEventListener("click", refreshEvent); - } + var evt = document.createEvent("HTMLEvents"); + evt.initEvent("change", true, true ); + urlElement.dispatchEvent(evt); + }; + + for(var index = 0; index < urlUpdaters.length; index++){ + var urlUpdater = urlUpdaters[index]; + urlUpdater.addEventListener("click", refreshEvent); + } if (window.EventBridge !== undefined) { var properties; @@ -1216,7 +1216,7 @@
Ambient URL
-
+
@@ -1294,7 +1294,7 @@
Skybox URL
-
+
@@ -1306,7 +1306,7 @@
Source URL
-
+
@@ -1320,14 +1320,14 @@
Href - Hifi://address
-
+
Description
-
+
@@ -1411,19 +1411,19 @@
X-axis Texture URL
-
+
Y-axis Texture URL
-
+
Z-axis Texture URL
-
+
@@ -1605,7 +1605,7 @@
Collision Sound URL
-
+
@@ -1623,7 +1623,7 @@
-
+
@@ -1636,7 +1636,7 @@
Model URL
-
+
@@ -1655,14 +1655,14 @@
Compound Shape URL
-
+
Animation URL
-
+