Merge pull request #7448 from Menithal/entity-properties-refresh-cache

Added Refresh Buttons to entityProperties
This commit is contained in:
Brad Hefta-Gaub 2016-03-24 17:34:46 -07:00
commit fc41c5bca9
2 changed files with 55 additions and 1 deletions

View file

@ -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 @@
<div class="label">Ambient URL</div>
<div class="value">
<input type="text" id="property-zone-key-ambient-url" class="url">
<div class="update-url-version"></div>
</div>
</div>
@ -1262,6 +1294,7 @@
<div class="label">Skybox URL</div>
<div class="value">
<input type="text" id="property-zone-skybox-url" class="url">
<div class="update-url-version"></div>
</div>
</div>
@ -1273,6 +1306,7 @@
<div class="label">Source URL</div>
<div class="value">
<input type="text" id="property-web-source-url" class="url">
<div class="update-url-version"></div>
</div>
</div>
@ -1286,12 +1320,14 @@
<div class="label">Href - Hifi://address</div>
<div class="value">
<input id="property-hyperlink-href" class="url">
<div class="update-url-version"></div>
</div>
</div>
<div class="hyperlink-section property">
<div class="label">Description</div>
<div class="value">
<input id="property-hyperlink-description" class="url">
<div class="update-url-version"></div>
</div>
</div>
@ -1375,16 +1411,19 @@
<div class="label">X-axis Texture URL</div>
<div class="value">
<input type="text" id="property-x-texture-url" class="url">
<div class="update-url-version"></div>
</div>
<div class="label">Y-axis Texture URL</div>
<div class="value">
<input type="text" id="property-y-texture-url" class="url">
<div class="update-url-version"></div>
</div>
<div class="label">Z-axis Texture URL</div>
<div class="value">
<input type="text" id="property-z-texture-url" class="url">
<div class="update-url-version"></div>
</div>
</div>
@ -1566,6 +1605,7 @@
<div class="label">Collision Sound URL</div>
<div class="value">
<input id="property-collision-sound-url" class="url">
<div class="update-url-version"></div>
</div>
</div>
@ -1583,6 +1623,7 @@
</div>
<div class="value">
<input id="property-script-url" class="url">
<div class="update-url-version"></div>
</div>
</div>
@ -1595,6 +1636,7 @@
<div class="label">Model URL</div>
<div class="value">
<input type="text" id="property-model-url" class="url">
<div class="update-url-version"></div>
</div>
</div>
@ -1613,12 +1655,14 @@
<div class="label">Compound Shape URL</div>
<div class="value">
<input type="text" id="property-compound-shape-url" class="url">
<div class="update-url-version"></div>
</div>
</div>
<div class="model-section property">
<div class="label">Animation URL</div>
<div class="value">
<input type="text" id="property-model-animation-url" class="url">
<div class="update-url-version"></div>
</div>
</div>
<div class="model-section property">

View file

@ -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 {