Skip to content

Commit

Permalink
fix(tabs): conflict with readme titles
Browse files Browse the repository at this point in the history 
fix #381
  • Loading branch information
@vogloblinsky
vogloblinsky committed Nov 25, 2017
1 parent 4c29be4 commit 230d96a
Show file tree
Hide file tree
Showing 9 changed files with 31 additions and 31 deletions.
4 changes: 2 additions & 2 deletions src/resources/js/libs/bootstrap-native.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@
this.handle = function(e) {
e = e || window.e; e.preventDefault();
var next = e.target; //the tab we clicked is now the next tab
var nextContent = document.getElementById(next.getAttribute('href').replace('#','')); //this is the actual object, the next tab content to activate
var nextContent = document.getElementById('c-'+next.getAttribute('href').replace('#','')); //this is the actual object, the next tab content to activate

// get current active tab and content
var activeTab = self.getActiveTab();
Expand Down Expand Up @@ -269,7 +269,7 @@
};
this.getActiveContent = function() {
var active = this.getActiveTab().getElementsByTagName('A')[0].getAttribute('href').replace('#','');
return active && document.getElementById(active)
return active && document.getElementById('c-'+active)
};

// init
Expand Down
6 changes: 3 additions & 3 deletions src/templates/partials/class.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
</ul>

<div class="tab-content">
<div class="tab-pane fade active in" id="info">
<div class="tab-pane fade active in" id="c-info">
<p class="comment">
<h3>File</h3>
</p>
Expand Down Expand Up @@ -100,13 +100,13 @@
</div>

{{#if class.readme}}
<div class="tab-pane fade" id="readme">
<div class="tab-pane fade" id="c-readme">
<p>{{{class.readme}}}</p>
</div>
{{/if}}

{{#unless disableSourceCode}}
<div class="tab-pane fade tab-source-code" id="source">
<div class="tab-pane fade tab-source-code" id="c-source">
<pre class="line-numbers"><code class="language-typescript">{{ class.sourceCode}}</code></pre>
</div>
{{/unless}}
Expand Down
12 changes: 6 additions & 6 deletions src/templates/partials/component.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,29 +35,29 @@
</ul>

<div class="tab-content">
<div class="tab-pane fade active in" id="info">
<div class="tab-pane fade active in" id="c-info">
{{~> component-detail component=component ~}}
</div>

{{#if component.readme}}
<div class="tab-pane fade" id="readme">
<div class="tab-pane fade" id="c-readme">
<p>{{{component.readme}}}</p>
</div>
{{/if}}

{{#unless disableSourceCode}}
<div class="tab-pane fade tab-source-code" id="source">
<div class="tab-pane fade tab-source-code" id="c-source">
<pre class="line-numbers"><code class="language-typescript">{{ component.sourceCode}}</code></pre>
</div>
{{/unless}}

{{#if component.templateData}}
<div class="tab-pane fade" id="templateData">
<div class="tab-pane fade" id="c-templateData">
<pre class="line-numbers"><code class="language-html">{{ component.templateData }}</code></pre>
</div>
{{/if}}

<div class="tab-pane fade" id="tree">
<div class="tab-pane fade" id="c-tree">
<div id="tree-container"></div>
<div class="tree-legend">
<div class="title">
Expand All @@ -75,7 +75,7 @@
</div>
</div>
{{#if component.exampleUrls}}
<div class="tab-pane fade" id="example">
<div class="tab-pane fade" id="c-example">
{{#each component.exampleUrls}}
<iframe src="{{this}}" style="height: 100vh; width: 100%;">
<p>Your browser does not support iframes.</p>
Expand Down
8 changes: 4 additions & 4 deletions src/templates/partials/directive.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
</ul>

<div class="tab-content">
<div class="tab-pane fade active in" id="info">
<div class="tab-pane fade active in" id="c-info">
<p class="comment">
<h3>File</h3>
</p>
Expand Down Expand Up @@ -207,19 +207,19 @@
</div>

{{#if directive.readme}}
<div class="tab-pane fade" id="readme">
<div class="tab-pane fade" id="c-readme">
<p>{{{directive.readme}}}</p>
</div>
{{/if}}

{{#unless disableSourceCode}}
<div class="tab-pane fade tab-source-code" id="source">
<div class="tab-pane fade tab-source-code" id="c-source">
<pre class="line-numbers"><code class="language-typescript">{{ directive.sourceCode}}</code></pre>
</div>
{{/unless}}

{{#if directive.exampleUrls}}
<div class="tab-pane fade" id="example">
<div class="tab-pane fade" id="c-example">
{{#each directive.exampleUrls}}
<iframe src="{{this}}" style="height: 100vh; width: 100%;">
<p>Your browser does not support iframes.</p>
Expand Down
6 changes: 3 additions & 3 deletions src/templates/partials/injectable.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
</ul>

<div class="tab-content">
<div class="tab-pane fade active in" id="info">
<div class="tab-pane fade active in" id="c-info">
<p class="comment">
<h3>File</h3>
</p>
Expand Down Expand Up @@ -76,13 +76,13 @@
</div>

{{#if injectable.readme}}
<div class="tab-pane fade" id="readme">
<div class="tab-pane fade" id="c-readme">
<p>{{{injectable.readme}}}</p>
</div>
{{/if}}

{{#unless disableSourceCode}}
<div class="tab-pane fade tab-source-code" id="source">
<div class="tab-pane fade tab-source-code" id="c-source">
<pre class="line-numbers"><code class="language-typescript">{{injectable.sourceCode}}</code></pre>
</div>
{{/unless}}
Expand Down
6 changes: 3 additions & 3 deletions src/templates/partials/interceptor.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
</ul>

<div class="tab-content">
<div class="tab-pane fade active in" id="info">
<div class="tab-pane fade active in" id="c-info">
<p class="comment">
<h3>File</h3>
</p>
Expand Down Expand Up @@ -76,13 +76,13 @@
</div>

{{#if injectable.readme}}
<div class="tab-pane fade" id="readme">
<div class="tab-pane fade" id="c-readme">
<p>{{{injectable.readme}}}</p>
</div>
{{/if}}

{{#unless disableSourceCode}}
<div class="tab-pane fade tab-source-code" id="source">
<div class="tab-pane fade tab-source-code" id="c-source">
<pre class="line-numbers"><code class="language-typescript">{{injectable.sourceCode}}</code></pre>
</div>
{{/unless}}
Expand Down
6 changes: 3 additions & 3 deletions src/templates/partials/interface.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
</ul>

<div class="tab-content">
<div class="tab-pane fade active in" id="info">
<div class="tab-pane fade active in" id="c-info">
<p class="comment">
<h3>File</h3>
</p>
Expand Down Expand Up @@ -251,13 +251,13 @@
</div>

{{#if interface.readme}}
<div class="tab-pane fade" id="readme">
<div class="tab-pane fade" id="c-readme">
<p>{{{interface.readme}}}</p>
</div>
{{/if}}

{{#unless disableSourceCode}}
<div class="tab-pane fade tab-source-code" id="source">
<div class="tab-pane fade tab-source-code" id="c-source">
<pre class="line-numbers"><code class="language-typescript">{{ interface.sourceCode}}</code></pre>
</div>
{{/unless}}
Expand Down
6 changes: 3 additions & 3 deletions src/templates/partials/module.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
</ul>

<div class="tab-content">
<div class="tab-pane fade active in" id="info">
<div class="tab-pane fade active in" id="c-info">

<p class="comment">
<h3>File</h3>
Expand Down Expand Up @@ -150,13 +150,13 @@
</div>

{{#if module.readme}}
<div class="tab-pane fade" id="readme">
<div class="tab-pane fade" id="c-readme">
<p>{{{module.readme}}}</p>
</div>
{{/if}}

{{#unless disableSourceCode}}
<div class="tab-pane fade tab-source-code" id="source">
<div class="tab-pane fade tab-source-code" id="c-source">
<pre class="line-numbers"><code class="language-typescript">{{ module.sourceCode}}</code></pre>
</div>
{{/unless}}
Expand Down
8 changes: 4 additions & 4 deletions src/templates/partials/pipe.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
</ul>

<div class="tab-content">
<div class="tab-pane fade active in" id="info">
<div class="tab-pane fade active in" id="c-info">

<p class="comment">
<h3>File</h3>
Expand Down Expand Up @@ -92,19 +92,19 @@
</div>

{{#if pipe.readme}}
<div class="tab-pane fade" id="readme">
<div class="tab-pane fade" id="c-readme">
<p>{{{pipe.readme}}}</p>
</div>
{{/if}}

{{#unless disableSourceCode}}
<div class="tab-pane fade tab-source-code" id="source">
<div class="tab-pane fade tab-source-code" id="c-source">
<pre class="line-numbers"><code class="language-typescript">{{ pipe.sourceCode}}</code></pre>
</div>
{{/unless}}

{{#if pipe.exampleUrls}}
<div class="tab-pane fade" id="example">
<div class="tab-pane fade" id="c-example">
{{#each pipe.exampleUrls}}
<iframe src="{{this}}" style="height: 100vh; width: 100%;">
<p>Your browser does not support iframes.</p>
Expand Down

0 comments on commit 230d96a

Please sign in to comment.