fix(masteries): revert refactor changes

SteveVanOpstal · Mar 28, 2016 · e65c28f · e65c28f
1 parent 4ff7f38
commit e65c28f
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/src/app/build/mastery-category.component.ts b/src/app/build/mastery-category.component.ts
@@ -56,12 +56,12 @@ export class MasteryCategoryComponent implements OnInit {
       this.forTier(tier.index - 1, (t) => t.lock());
     }
     if (tier.getRank() > mastery.getRank()) {
-      mastery.setRank(mastery.getMaxRank() - mastery.getRank());
+      tier.setOtherRank(mastery, mastery.getMaxRank() - mastery.getRank());
     }
     var deviation = this.getTotalRankDeviation();
     if (deviation) {
       if (tier.getRank() > mastery.getRank()) {
-        mastery.setRank(tier.getRank() - deviation - mastery.getRank());
+        tier.setOtherRank(mastery, tier.getRank() - deviation - mastery.getRank());
       } else {
         mastery.setRank(tier.getRank() - deviation);
       }

diff --git a/src/app/build/mastery-tier.component.ts b/src/app/build/mastery-tier.component.ts
@@ -45,6 +45,13 @@ export class MasteryTierComponent implements OnInit {
     this.forEachMastery((m) => m.unlock());
   }
 
+  public setOtherRank(mastery: MasteryComponent, rank: number) {
+    this.masteries.forEach(function(m: MasteryComponent) {
+      if (mastery !== m) {
+        m.setRank(rank);
+      }
+    });
+  }
   public getRank(): number {
     var rank = 0;
     this.forEachMastery((m) => rank += m.getRank());

diff --git a/src/app/build/mastery.component.ts b/src/app/build/mastery.component.ts
@@ -15,7 +15,7 @@ export class Colors {
   selector: 'mastery',
   directives: [NgIf, NgClass, DDragonDirective],
   template: `
-    <div *ngIf="data" [ngClass]="{disabled: disabled, active: active}" (click)="clicked()" (contextmenu)="rightClicked()" (dragend)="dragEnd()">
+    <div *ngIf="data" [ngClass]="{enabled: enabled, active: active}" (click)="clicked()" (contextmenu)="rightClicked()" (dragend)="dragEnd()">
       <svg xmlns="http://www.w3.org/2000/svg" version="1.1" *ngIf="data.ranks > 1" class="rank" width="30" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
         <defs>
           <radialGradient cy="10%" fy="0%" id="radialGradient">

diff --git a/src/assets/css/build.css b/src/assets/css/build.css
@@ -153,11 +153,11 @@ mastery > div:before {
   z-index: 10;
 }
 
-mastery > div:not(.disabled):before {
+mastery > div.enabled:before {
   border: 2px solid #356BB0;
 }
 
-mastery > div:not(.disabled) {
+mastery > div.enabled {
   cursor: pointer;
 }
 
@@ -168,7 +168,7 @@ mastery .rank {
   z-index: 20;
 }
 
-mastery > div.disabled .rank {
+mastery > div:not(.enabled) .rank {
   cursor: default;
 }