Fixed vueui resources not working (#5095)

* Fixed vueui resources not working

* Changelog

* Mistake
This commit is contained in:
Karolis
2018-08-06 21:51:43 +02:00
committed by Werner
parent cdaff13ec2
commit eeda41a31f
4 changed files with 16 additions and 2 deletions
+6 -1
View File
@@ -126,7 +126,7 @@ main ui datum.
<header-[header]></header-[header]>
</div>
<div id="app">
Javascript file has failed to load. <a href="?src=\ref[src]&vueuiforceresource=1">Click here to force load resources</a>
</div>
[debugtxt]
<noscript>
@@ -232,6 +232,11 @@ main ui datum.
update_status()
if(status < STATUS_INTERACTIVE || user != usr)
return
if(href_list["vueuiforceresource"])
if(user.client)
user.client << browse_rsc(file("vueui/dist/app.js"), "vueui.js")
user.client << browse_rsc(file("vueui/dist/app.css"), "vueui.css")
open()
if(href_list["vueuistateupdate"])
var/rdata = json_decode(href_list["vueuistateupdate"])
var/ndata = rdata["state"]
@@ -0,0 +1,5 @@
author: Karolis2011
delete-after: True
changes:
- bugfix: Added a reliable way to manually force send resources to client if asset manager fails.
+4
View File
@@ -144,4 +144,8 @@ input, textarea, button, select, .button {
.uiTitleFluff {
display: none;
}
.csserror {
display: none;
}
+1 -1
View File
@@ -45,7 +45,7 @@ window.__wtimetimer = window.setInterval(() => {
new Vue({
data: Store.state,
template: "<div><component v-if='componentName' :is='componentName'/><component v-if='templateString' :is='{template:templateString}'/></div>",
template: "<div><p class='csserror'>Javascript loaded, stylesheets has failed to load. <a href='javascript:void(0)'><vui-button :params='{ vueuiforceresource: 1}'>Click here to load.</vui-button></a></p><component v-if='componentName' :is='componentName'/><component v-if='templateString' :is='{template:templateString}'/></div>",
computed: {
componentName() {
if(this.$root.$data.active.charAt(0) != "?") {