Merge branch 'develop' into task/6778-add-storage-move-to-cron

[friendica.git] / view / theme / frio / templates / theme_settings.tpl

diff --git a/view/theme/frio/templates/theme_settings.tpl b/view/theme/frio/templates/theme_settings.tpl
index eaa71d3fe1dc3cae9b6077ba00dc8cb688a7a349..1c870c92be94ea02a0e2c2d74b1d5a1b30dc1cdb 100644 (file)
--- a/view/theme/frio/templates/theme_settings.tpl
+++ b/view/theme/frio/templates/theme_settings.tpl
@@ -60,20 +60,20 @@
                        if ($("#id_frio_background_image").length) {
                                theme.background_image = $("#id_frio_background_image").val();
 
-                               var elText = theme.background_image;
-
-                               if ($("#id_frio_bg_image_option_stretch").is(":checked") == true) {
-                                   theme.background_image_option = "stretch";
-                               }
-                               if ($("#id_frio_bg_image_option_cover").is(":checked") == true) {
-                                   theme.background_image_option = "cover";
-                               }
-                               if ($("#id_frio_bg_image_option_contain").is(":checked") == true) {
-                                   theme.background_image_option = "contain";
-                               }
-                               if ($("#id_frio_bg_image_option_repeat").is(":checked") == true) {
-                                   theme.background_image_option = "repeat";
-                               }
+                               if (theme.background_image.length > 0) {
+                                       if ($("#id_frio_bg_image_option_stretch").is(":checked") == true) {
+                                               theme.background_image_option = "stretch";
+                                       }
+                                       if ($("#id_frio_bg_image_option_cover").is(":checked") == true) {
+                                               theme.background_image_option = "cover";
+                                       }
+                                       if ($("#id_frio_bg_image_option_contain").is(":checked") == true) {
+                                               theme.background_image_option = "contain";
+                                       }
+                                       if ($("#id_frio_bg_image_option_repeat").is(":checked") == true) {
+                                               theme.background_image_option = "repeat";
+                                       }
+                                }
                        }
 
                        if ($("#frio_contentbg_transp").length) {
@@ -87,9 +87,10 @@
                        if ($("#id_frio_login_bg_color").length) {
                                theme.login_bg_color = $("#id_frio_login_bg_color").val();
                        }
-
-                       var share_string = JSON.stringify(theme);
-                       $("#id_frio_share_string").val(share_string);
+                       if (!($("#id_frio_share_string").is(":focus"))){
+                               var share_string = JSON.stringify(theme);
+                               $("#id_frio_share_string").val(share_string);
+                       }
                }
 
                // interval because jquery.val does not trigger events
@@ -121,23 +122,23 @@
                                var elText = theme.background_image;
                                if(elText.length !== 0) {
                                        $("#frio_bg_image_options").show();
-                           } else {
-                                   $("#frio_bg_image_options").hide();
-                           }
+                               } else {
+                                       $("#frio_bg_image_options").hide();
+                               }
 
                                switch (theme.background_image_option) {
-                                   case 'stretch':
-                                       $("#id_frio_bg_image_option_stretch").prop("checked", true);
-                                       break;
-                                   case 'cover':
-                                       $("#id_frio_bg_image_option_cover").prop("checked", true);
-                                       break;
-                                   case 'contain':
-                                       $("#id_frio_bg_image_option_contain").prop("checked", true);
-                                       break;
-                                   case 'repeat':
-                                       $("#id_frio_bg_image_option_repeat").prop("checked", true);
-                                       break;
+                                       case 'stretch':
+                                               $("#id_frio_bg_image_option_stretch").prop("checked", true);
+                                               break;
+                                       case 'cover':
+                                               $("#id_frio_bg_image_option_cover").prop("checked", true);
+                                               break;
+                                       case 'contain':
+                                               $("#id_frio_bg_image_option_contain").prop("checked", true);
+                                               break;
+                                       case 'repeat':
+                                               $("#id_frio_bg_image_option_repeat").prop("checked", true);
+                                               break;
                                }
                        }