Download as
Browse Code »

Commit 7f3803489b12fe16d9eabaa2e3afcd0ff0539deb

Authored by Rafael Diego
2 parents e26b075f 5635c0f6
Exists in master and in 4 other branches feature-captcha, production, staging, the_glorious_return_of_piwik

Merge branch 'master' into staging

Showing 2 changed files with 9 additions and 6 deletions   Show diff stats
src/app/components/category-list/category-list.directive.js
  Diff comments   View file @7f38034
@@ -28,11 +28,14 @@ @@ -28,11 +28,14 @@
28 28
29 CategoryListController.prototype.init = function() { 29 CategoryListController.prototype.init = function() {
30 var vm = this; 30 var vm = this;
  31 +
  32 + vm.pathUrl = vm.$location.path();
  33 + console.log("--------------",vm.pathUrl);
31 34
32 - vm.showCloseBtn = null; 35 + vm.showCloseBtn = true;
33 36
34 - // Disable button close of page ranking  
35 - if(vm.$location.path() == "/ranking"){ 37 + // Disable button remove of page ranking
  38 + if(vm.pathUrl=="/ranking"){
36 vm.showCloseBtn = false; 39 vm.showCloseBtn = false;
37 } 40 }
38 41
@@ -103,4 +106,4 @@ @@ -103,4 +106,4 @@
103 return directive; 106 return directive;
104 } 107 }
105 108
106 -})(); 109 -})();
  110 +})();
107 \ No newline at end of file 111 \ No newline at end of file
src/app/components/category-list/category-list.html
  Diff comments   View file @7f38034
@@ -16,11 +16,11 @@ @@ -16,11 +16,11 @@
16 <span class="category-list--icon icon" aria-hidden="true" ng-class="'icon-tema-' + category.slug + '-small'"></span> 16 <span class="category-list--icon icon" aria-hidden="true" ng-class="'icon-tema-' + category.slug + '-small'"></span>
17 <span class="category-list--label">{{::category.name}}</span> 17 <span class="category-list--label">{{::category.name}}</span>
18 <span class="category-list--icon--right glyphicon glyphicon-chevron-right hidden-xs" ng-hide="vm.selectedCategory.slug === category.slug"></span> 18 <span class="category-list--icon--right glyphicon glyphicon-chevron-right hidden-xs" ng-hide="vm.selectedCategory.slug === category.slug"></span>
19 - <span ng-if="showCloseBtn" class="category-list--icon--right glyphicon glyphicon-remove hidden-xs" ng-show="vm.selectedCategory.slug === category.slug"></span> 19 + <span ng-if="vm.showCloseBtn" class="category-list--icon--right glyphicon glyphicon-remove hidden-xs" ng-show="vm.selectedCategory.slug === category.slug"></span>
20 <div ng-if="category.archived" class="category-list--icon-archived"> 20 <div ng-if="category.archived" class="category-list--icon-archived">
21 <span class="glyphicon glyphicon-ok" aria-hidden="true"></span> 21 <span class="glyphicon glyphicon-ok" aria-hidden="true"></span>
22 </div> 22 </div>
23 </button> 23 </button>
24 </div> 24 </div>
25 </nav> 25 </nav>
26 -</div> 26 -</div>
  27 +</div>
27 \ No newline at end of file 28 \ No newline at end of file