Merge branch 'img-playground' of ssh://git.nowoczesnapolska.org.pl:2223/~/repo/redakc...

[redakcja.git] / redakcja / static / js / wiki / base.js

diff --git a/redakcja/static/js/wiki/base.js b/redakcja/static/js/wiki/base.js
index 3fa47cc..8625b11 100644 (file)
--- a/redakcja/static/js/wiki/base.js
+++ b/redakcja/static/js/wiki/base.js
@@ -111,7 +111,7 @@
                if($tab.length != 1)
                        $tab = $(DEFAULT_PERSPECTIVE);
 
                if($tab.length != 1)
                        $tab = $(DEFAULT_PERSPECTIVE);
 

-               var $old = $('#tabs li').filter('.active');
+               var $old = $tab.closest('.tabs').find('.active');

 
                $old.each(function(){
                        $(this).removeClass('active');
 
                $old.each(function(){
                        $(this).removeClass('active');


@@ -298,15 +298,14 @@
                reportErrors: function(errors) {
                        var global = $("*[data-ui-error-for='__all__']", this.$elem);
                        var unassigned = [];
                reportErrors: function(errors) {
                        var global = $("*[data-ui-error-for='__all__']", this.$elem);
                        var unassigned = [];

-                       var unassigned_text = '';

 
 

+            $("*[data-ui-error-for]", this.$elem).text('');

                        for (var field_name in errors)
                        {
                                var span = $("*[data-ui-error-for='"+field_name+"']", this.$elem);
 
                                if(!span.length) {
                                        unassigned.push(field_name);
                        for (var field_name in errors)
                        {
                                var span = $("*[data-ui-error-for='"+field_name+"']", this.$elem);
 
                                if(!span.length) {
                                        unassigned.push(field_name);

-                                       unassigned_text += errors[field_name];

                                        continue;
                                }
 
                                        continue;
                                }
 


@@ -314,7 +313,7 @@
                        }
 
                        if(unassigned.length > 0)
                        }
 
                        if(unassigned.length > 0)

-                               global.text( global.text() + unassigned_text);
+                               global.text( global.text() + 'W formularzu wystąpiły błędy');

                }
        };
 
                }
        };