Fix preview of theming

Pull request #5584 made cached SCSS files depend on a hash of the base
URL, so the "/css/core/server.css" file does no longer exist; as the
file can not be loaded the "Loading preview" message is never removed
and the "Saved" message is never shown.

As it now depends on the hash of the base URL the file to be reloaded
can no longer be hardcoded, so the full URL to the "server.css" file
that has to be reloaded (if any) is now got from the DataResponse
provided by the controller.

Fixes #5975

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>

diff --git a/apps/theming/js/settings-admin.js b/apps/theming/js/settings-admin.js
index 8a854a37414e70133865ca9ba0253f041b7b2ebc..c150387f0ad097e09576c76bf305b4259834f15d 100644 (file)
--- a/apps/theming/js/settings-admin.js
+++ b/apps/theming/js/settings-admin.js
@@ -30,7 +30,7 @@ function setThemingValue(setting, value) {
                OC.generateUrl('/apps/theming/ajax/updateStylesheet'), {'setting' : setting, 'value' : value}
        ).done(function(response) {
                hideUndoButton(setting, value);
-               preview(setting, value);
+               preview(setting, value, response.data.serverCssUrl);
        }).fail(function(response) {
                OC.msg.finishedSaving('#theming_settings_msg', response);
                $('#theming_settings_loading').hide();
@@ -38,9 +38,9 @@ function setThemingValue(setting, value) {
 
 }
 
-function preview(setting, value) {
+function preview(setting, value, serverCssUrl) {
        OC.msg.startAction('#theming_settings_msg', t('theming', 'Loading preview…'));
-       var stylesheetsLoaded = 2;
+       var stylesheetsLoaded = 1;
        var reloadStylesheets = function(cssFile) {
                var queryString = '?reload=' + new Date().getTime();
                var url = cssFile + queryString;
@@ -62,7 +62,11 @@ function preview(setting, value) {
                stylesheet.appendTo("head");
        };
 
-       reloadStylesheets(OC.generateUrl('/css/core/server.css'));
+       if (serverCssUrl !== undefined) {
+               stylesheetsLoaded++;
+
+               reloadStylesheets(serverCssUrl);
+       }
        reloadStylesheets(OC.generateUrl('/apps/theming/styles'));
 
        // Preview images
@@ -218,7 +222,7 @@ $(document).ready(function () {
                                var input = document.getElementById('theming-'+setting);
                                input.value = response.data.value;
                        }
-                       preview(setting, response.data.value);
+                       preview(setting, response.data.value, response.data.serverCssUrl);
                });
        });