Language dropdown fix

sunhater · Aug 19, 2014 · 8a9c360 · 8a9c360
1 parent fa2c987
commit 8a9c360
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 10 deletions.
diff --git a/cache/base.js b/cache/base.js
diff --git a/js/006.jquery.transForm.js b/js/006.jquery.transForm.js
@@ -389,9 +389,12 @@
                     selected.css({
                         width: menu.outerWidth() - outerHSpace(selected)
                     });
-                    el.css({
-                        width: selected.outerWidth() + button.outerWidth()
-                    });
+                    var i = 0;
+                    do {
+                       el.css({
+                            width: selected.outerWidth() + button.outerWidth() + i++
+                       });
+                    } while ((selected.offset().top != button.offset().top) && (i < 10000));
                     menu.css({
                         marginTop: el.outerHeight() - 1,
                         width: el.outerWidth() - outerHSpace(menu)
@@ -689,9 +692,12 @@
                             el.attr('label', $(t).attr('label'))
                         };
 
-                    info.css({
-                        width: el.innerWidth() - button.outerWidth() - outerHSpace(info)
-                    });
+                    var i = 0;
+                    do {
+                        info.css({
+                            width: el.innerWidth() - button.outerWidth() - outerHSpace(info) - i++
+                        });
+                    } while ((info.offset().top != button.offset().top) && (i < 10000));
 
                     $(t).css({
                         width: el.outerWidth(),

diff --git a/js/060.toolbar.js b/js/060.toolbar.js
@@ -23,6 +23,7 @@ _.initToolbar = function() {
         $('#toolbar a[href="kcact:settings"]').addClass('selected');
         $('#settings').show();
         _.resize();
+        $('#lang').transForm();
     }
 
     $('#toolbar a[href="kcact:settings"]').click(function () {
@@ -32,6 +33,8 @@ _.initToolbar = function() {
             $.$.kuki.set('displaySettings', "on");
             jSettings.show();
             _.fixFilesHeight();
+            if (!jSettings.find('.tf-select #lang').get(0))
+                $('#lang').transForm();
         } else {
             $(this).removeClass('selected');
             $.$.kuki.set('displaySettings', "off");

diff --git a/js/070.settings.js b/js/070.settings.js
@@ -98,7 +98,4 @@ _.initLangs = function() {
     $('#lang').change(function() {
         window.location = _.getURL("browser", this.value) + "&theme=" + encodeURIComponent(_.theme);
     });
-    setTimeout(function() {
-        $('#lang').transForm();
-    }, 0);
 }