Moving caret back to selected node when documentCanvas is shown again

[fnpeditor.git] / views / tabs / tabs.js

diff --git a/views/tabs/tabs.js b/views/tabs/tabs.js
index de776c6..7298d4e 100644 (file)
--- a/views/tabs/tabs.js
+++ b/views/tabs/tabs.js
@@ -31,18 +31,24 @@ define([
             if(this.options.stacked) {\r
                 this.nodes.tabBar.addClass('nav-stacked nav-pills').removeClass('nav-tabs');\r
             }\r
             if(this.options.stacked) {\r
                 this.nodes.tabBar.addClass('nav-stacked nav-pills').removeClass('nav-tabs');\r
             }\r

+            if(this.options.position === 'right') {\r
+                this.$el.addClass('tabs-right');\r
+                this.nodes.content.addClass('tab-content');\r
+            }\r

             return this;\r
         },\r
         \r
         addTab: function(title, slug, content) {\r
             return this;\r
         },\r
         \r
         addTab: function(title, slug, content) {\r

-            if(this.contents[slug])\r
-                return false;\r
+            if(this.contents[slug]) {\r
+                this.contents[slug].detach();\r
+            }\r

             this.contents[slug] = content;\r
             \r
             var text = (typeof title === 'string') ? title : (title.text || '');\r
             var icon = title.icon || null;\r
             \r
             this.contents[slug] = content;\r
             \r
             var text = (typeof title === 'string') ? title : (title.text || '');\r
             var icon = title.icon || null;\r
             \r

-            this.nodes.tabBar.append(this.handleTemplate({text: text, icon: icon, slug: slug}));\r
+            if(!this.tabExists(slug))\r
+                this.nodes.tabBar.append(this.handleTemplate({text: text, icon: icon, slug: slug}));\r

             if(!this.selectedTab)\r
                 this.selectTab(slug);\r
         },\r
             if(!this.selectedTab)\r
                 this.selectTab(slug);\r
         },\r


@@ -54,6 +60,9 @@ define([
                 if(this.selectedTab)\r
                     this.contents[this.selectedTab].detach();\r
                 this.nodes.content.append(this.contents[slug]);\r
                 if(this.selectedTab)\r
                     this.contents[this.selectedTab].detach();\r
                 this.nodes.content.append(this.contents[slug]);\r

+                if(this.contents[slug].onShow) {\r
+                    this.contents[slug].onShow();\r
+                }\r

                 this.nodes.tabBar.find('.active').removeClass('active');\r
                 this.nodes.tabBar.find('a[href="#'+slug+'"]').parent().addClass('active');\r
                 \r
                 this.nodes.tabBar.find('.active').removeClass('active');\r
                 this.nodes.tabBar.find('a[href="#'+slug+'"]').parent().addClass('active');\r
                 \r


@@ -71,6 +80,10 @@ define([
             return this.selectedTab;\r
         },\r
         \r
             return this.selectedTab;\r
         },\r
         \r

+        tabExists: function(slug) {\r
+            return this.nodes.tabBar.find('a[href="#'+ slug + '"]').length > 0;\r
+        },\r
+        \r

         /* Events */\r
         \r
         _onTabTitleClicked: function(e) {\r
         /* Events */\r
         \r
         _onTabTitleClicked: function(e) {\r