Fix errors in caret placement on box open and in annotation browser.

[redakcja.git] / src / redakcja / static / js / wiki_img / base.js

diff --git a/src/redakcja/static/js/wiki_img/base.js b/src/redakcja/static/js/wiki_img/base.js
index ffe5a01..e38b1d8 100644 (file)
--- a/src/redakcja/static/js/wiki_img/base.js
+++ b/src/redakcja/static/js/wiki_img/base.js
@@ -38,7 +38,7 @@
 
 
        $.wiki.activePerspective = function() {
 
 
        $.wiki.activePerspective = function() {

-               return this.perspectives[$("#tabs li.active").attr('id')];
+           return this.perspectives[$("#tabs li a.active").parent().attr('id')];

        };
 
        $.wiki.exitContext = function() {
        };
 
        $.wiki.exitContext = function() {


@@ -60,7 +60,10 @@
                var base_id = 'id' + Math.floor(Math.random()* 5000000000);
                var id = (''+klass)+'_' + base_id;
                var $tab = $('<li id="'+id+'" data-ui-related="'+base_id+'" data-ui-jsclass="'+klass+'" >'
                var base_id = 'id' + Math.floor(Math.random()* 5000000000);
                var id = (''+klass)+'_' + base_id;
                var $tab = $('<li id="'+id+'" data-ui-related="'+base_id+'" data-ui-jsclass="'+klass+'" >'

-                               + title + '<img src="'+STATIC_URL+'icons/close.png" class="tabclose"></li>');
+                            + title + '<img src="'+STATIC_URL+'icons/close.png" class="tabclose"></li>');
+                var $tab = $('<li class="nav-item" id="'+id+'" data-ui-related="'+base_id+'" data-ui-jsclass="'+klass+'" ><a href="#" class="nav-link">'
+                         + title + ' <span class="badge badge-danger tabclose">x</span></a></li>');
+

                var $view = $('<div class="editor '+klass+'" id="'+base_id+'"> </div>');
 
                this.perspectives[id] = new $.wiki[klass]({
                var $view = $('<div class="editor '+klass+'" id="'+base_id+'"> </div>');
 
                this.perspectives[id] = new $.wiki[klass]({


@@ -96,28 +99,29 @@
        }
 
        $.wiki.switchToTab = function(tab){
        }
 
        $.wiki.switchToTab = function(tab){

-               var self = this;
-               var $tab = $(tab);
+           var self = this;
+           var $tab = $(tab);

 
 

-               if($tab.length != 1)
-                       $tab = $(DEFAULT_PERSPECTIVE);
+           if($tab.length != 1)
+               $tab = $(DEFAULT_PERSPECTIVE);

 
 

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

 
 

-               $old.each(function(){
-                       $(this).removeClass('active');
-                       self.perspectives[$(this).attr('id')].onExit();
-                       $('#' + $(this).attr('data-ui-related')).hide();
-               });
+           $old_a.each(function(){
+                var tab = $(this).parent();
+               $(this).removeClass('active');
+               self.perspectives[tab.attr('id')].onExit();
+               $('#' + tab.attr('data-ui-related')).hide();
+           });

 
 

-               /* show new */
-               $tab.addClass('active');
-               $('#' + $tab.attr('data-ui-related')).show();
+           /* show new */
+           $('a', tab).addClass('active');
+           $('#' + $tab.attr('data-ui-related')).show();

 
 

-               console.log($tab);
-               console.log($.wiki.perspectives);
+           console.log($tab);
+           console.log($.wiki.perspectives);

 
 

-               $.wiki.perspectives[$tab.attr('id')].onEnter();
+           $.wiki.perspectives[$tab.attr('id')].onEnter();

        };
 
        /*
        };
 
        /*