Skip to content

Commit d886cc4

Browse files
committed
Merge pull request #98 from mulesoft/bugs/fix-toggle-resources
fix toggler
2 parents f74faf7 + d12ac96 commit d886cc4

File tree

3 files changed

+10
-6
lines changed

3 files changed

+10
-6
lines changed

dist/scripts/api-console.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1569,21 +1569,23 @@
15691569
var $this = jQuery($event.currentTarget);
15701570

15711571
if ($this.hasClass('raml-console-resources-expanded')) {
1572+
$scope.collapsed = true;
15721573
$this.text('expand all');
15731574
$this.removeClass('raml-console-resources-expanded');
15741575
jQuery('#raml-console-resources-container').find('ol.raml-console-resource-list').velocity('slideUp', {
15751576
duration: 200
15761577
});
15771578
} else {
1579+
$scope.collapsed = false;
15781580
$this.text('collapse all');
15791581
$this.addClass('raml-console-resources-expanded');
15801582
jQuery('#raml-console-resources-container').find('ol.raml-console-resource-list').velocity('slideDown', {
15811583
duration: 200
15821584
});
15831585
}
15841586

1585-
jQuery('#raml-console-resources-container').find('.raml-console-resource-list-root ol.raml-console-resource-list').toggleClass('raml-console-is-collapsed');
1586-
jQuery('#raml-console-resources-container').find('button.raml-console-resource-root-toggle').toggleClass('raml-console-is-active');
1587+
// jQuery('#raml-console-resources-container').find('.raml-console-resource-list-item ol.raml-console-resource-list').toggleClass('raml-console-is-collapsed');
1588+
// jQuery('#raml-console-resources-container').find('button.raml-console-resource-root-toggle').toggleClass('raml-console-is-active');
15871589
};
15881590

15891591
$scope.hasResourcesWithChilds = function () {
@@ -5378,7 +5380,7 @@ angular.module('ramlConsoleApp').run(['$templateCache', function($templateCache)
53785380
"\n" +
53795381
" <root-documentation></root-documentation>\n" +
53805382
"\n" +
5381-
" <ol <ol ng-class=\"{'raml-console-resources-container-no-title': disableTitle, 'raml-console-resources-container': !disableTitle}\" id=\"raml-console-resources-container\" class=\"raml-console-resource-list raml-console-resource-list-root\">\n" +
5383+
" <ol ng-class=\"{'raml-console-resources-container-no-title': disableTitle, 'raml-console-resources-container': !disableTitle}\" id=\"raml-console-resources-container\" class=\"raml-console-resource-list raml-console-resource-list-root\">\n" +
53825384
" <li id=\"raml_documentation\" class=\"raml-console-resource-list-item raml-console-documentation-header\">\n" +
53835385
" <div ng-if=\"proxy\" align=\"right\" class=\"raml-console-resource-proxy\">\n" +
53845386
" <label for=\"raml-console-api-behind-firewall\">API is behind a firewall <a href=\"http://www.mulesoft.org/documentation/display/current/Accessing+Your+API+Behind+a+Firewall\" target=\"_blank\">(?)</a></label>\n" +

src/app/resources/resources.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,21 +85,23 @@
8585
var $this = jQuery($event.currentTarget);
8686

8787
if ($this.hasClass('raml-console-resources-expanded')) {
88+
$scope.collapsed = true;
8889
$this.text('expand all');
8990
$this.removeClass('raml-console-resources-expanded');
9091
jQuery('#raml-console-resources-container').find('ol.raml-console-resource-list').velocity('slideUp', {
9192
duration: 200
9293
});
9394
} else {
95+
$scope.collapsed = false;
9496
$this.text('collapse all');
9597
$this.addClass('raml-console-resources-expanded');
9698
jQuery('#raml-console-resources-container').find('ol.raml-console-resource-list').velocity('slideDown', {
9799
duration: 200
98100
});
99101
}
100102

101-
jQuery('#raml-console-resources-container').find('.raml-console-resource-list-root ol.raml-console-resource-list').toggleClass('raml-console-is-collapsed');
102-
jQuery('#raml-console-resources-container').find('button.raml-console-resource-root-toggle').toggleClass('raml-console-is-active');
103+
// jQuery('#raml-console-resources-container').find('.raml-console-resource-list-item ol.raml-console-resource-list').toggleClass('raml-console-is-collapsed');
104+
// jQuery('#raml-console-resources-container').find('button.raml-console-resource-root-toggle').toggleClass('raml-console-is-active');
103105
};
104106

105107
$scope.hasResourcesWithChilds = function () {

src/app/resources/resources.tpl.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ <h1 ng-if="!disableTitle" class="raml-console-title">{{raml.title}}</h1>
2020

2121
<root-documentation></root-documentation>
2222

23-
<ol <ol ng-class="{'raml-console-resources-container-no-title': disableTitle, 'raml-console-resources-container': !disableTitle}" id="raml-console-resources-container" class="raml-console-resource-list raml-console-resource-list-root">
23+
<ol ng-class="{'raml-console-resources-container-no-title': disableTitle, 'raml-console-resources-container': !disableTitle}" id="raml-console-resources-container" class="raml-console-resource-list raml-console-resource-list-root">
2424
<li id="raml_documentation" class="raml-console-resource-list-item raml-console-documentation-header">
2525
<div ng-if="proxy" align="right" class="raml-console-resource-proxy">
2626
<label for="raml-console-api-behind-firewall">API is behind a firewall <a href="http://www.mulesoft.org/documentation/display/current/Accessing+Your+API+Behind+a+Firewall" target="_blank">(?)</a></label>

0 commit comments

Comments
 (0)