Merge branch 'master' of https://github.com/fnp/wolnelektury

[wolnelektury.git] / wolnelektury / static / js / dialogs.js

diff --git a/wolnelektury/static/js/dialogs.js b/wolnelektury/static/js/dialogs.js
index 0df6508..d44dab3 100755 (executable)
--- a/wolnelektury/static/js/dialogs.js
+++ b/wolnelektury/static/js/dialogs.js
@@ -58,7 +58,7 @@
             $('body').append($window);
 
             $window.jqm({
-                ajax: '/uzytkownicy/zaloguj-utworz/',
+                ajax: '/uzytkownik/zaloguj-utworz/?next=' + escape(window.location),
                 ajaxText: '<p><img src="' + STATIC_URL + 'img/indicator.gif" alt="*"/> ' + gettext("Loading") + '</p>',
                 target: $('.target', $window)[0],
                 overlay: 60,
@@ -79,6 +79,7 @@
                                 $('.target', $window).text(response.message);
                                 setTimeout(function() { $window.jqmHide() }, 1000);
                                 $form.submit();
+                                location.reload();
                             }
                             else {
                                 $('.error', $window).remove();
@@ -145,10 +146,52 @@
         };
 
         var ajaxable_callbacks = {
-            'social-book-sets': update_star
+            'social-book-sets': location.reload
         };
 
 
+
+    // check placeholder browser support
+    if (!Modernizr.input.placeholder)
+    {
+        // set placeholder values
+        $(this).find('[placeholder]').each(function()
+        {
+            $(this).val( $(this).attr('placeholder') ).addClass('placeholder');
+        });
+ 
+        // focus and blur of placeholders
+        $('[placeholder]').focus(function()
+        {
+            if ($(this).val() == $(this).attr('placeholder'))
+            {
+                $(this).val('');
+                $(this).removeClass('placeholder');
+            }
+        }).blur(function()
+        {
+            if ($(this).val() == '' || $(this).val() == $(this).attr('placeholder'))
+            {
+                $(this).val($(this).attr('placeholder'));
+                $(this).addClass('placeholder');
+            }
+        });
+
+        // remove placeholders on submit
+        $('[placeholder]').closest('form').submit(function()
+        {
+            $(this).find('[placeholder]').each(function()
+            {
+                if ($(this).val() == $(this).attr('placeholder'))
+                {
+                    $(this).val('');
+                }
+            })
+        });
+    }
+
+
+
     });
 })(jQuery)