fix: support closure-compiler in the library

ng-bootstrap · Jun 15, 2017 · 5cfd9e4 · 5cfd9e4
1 parent 4d1b396
commit 5cfd9e4
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 12 deletions.
diff --git a/src/datepicker/datepicker-month-view.ts b/src/datepicker/datepicker-month-view.ts
@@ -36,10 +36,7 @@ import {DayTemplateContext} from './datepicker-day-template-context';
          [class.hidden]="isHidden(day)">
           <ng-template [ngIf]="!isHidden(day)">
             <ng-template [ngTemplateOutlet]="dayTemplate"
-            [ngOutletContext]="{date: {year: day.date.year, month: day.date.month, day: day.date.day},
-              currentMonth: month.number,
-              disabled: isDisabled(day),
-              selected: isSelected(day.date)}">
+            [ngOutletContext]="_getDayContext(day, month)">
             </ng-template>
           </ng-template>
         </div>
@@ -66,6 +63,15 @@ export class NgbDatepickerMonthView {
     }
   }
 
+  _getDayContext(day: any, month: any) {
+    return {
+      date: {year: day.date.year, month: day.date.month, day: day.date.day},
+      currentMonth: month.number,
+      disabled: this.isDisabled(day),
+      selected: this.isSelected(day.date)
+    };
+  }
+
   isDisabled(day: DayViewModel) { return this.disabled || day.disabled; }
 
   isSelected(date: NgbDate) { return this.selectedDate && this.selectedDate.equals(date); }

diff --git a/src/typeahead/typeahead-window.ts b/src/typeahead/typeahead-window.ts
@@ -32,7 +32,7 @@ export interface ResultTemplateContext {
         (mouseenter)="markActive(idx)"
         (click)="select(result)">
           <ng-template [ngTemplateOutlet]="resultTemplate || rt"
-          [ngOutletContext]="{result: result, term: term, formatter: formatter}"></ng-template>
+          [ngOutletContext]="_getResultContext(result)"></ng-template>
       </button>
     </ng-template>
   `
@@ -79,6 +79,8 @@ export class NgbTypeaheadWindow implements OnInit {
 
   @Output('activeChange') activeChangeEvent = new EventEmitter();
 
+  _getResultContext(result: any) { return {result: result, term: this.term, formatter: this.formatter}; }
+
   getActive() { return this.results[this.activeIdx]; }
 
   markActive(activeIdx: number) {

diff --git a/src/util/positioning.ts b/src/util/positioning.ts
@@ -87,12 +87,12 @@ export class Positioning {
     const placementSecondary = placement.split('-')[1] || 'center';
 
     let targetElPosition: ClientRect = {
-      height: targetElBCR.height || targetElement.offsetHeight,
-      width: targetElBCR.width || targetElement.offsetWidth,
-      top: 0,
-      bottom: targetElBCR.height || targetElement.offsetHeight,
-      left: 0,
-      right: targetElBCR.width || targetElement.offsetWidth
+      'height': targetElBCR.height || targetElement.offsetHeight,
+      'width': targetElBCR.width || targetElement.offsetWidth,
+      'top': 0,
+      'bottom': targetElBCR.height || targetElement.offsetHeight,
+      'left': 0,
+      'right': targetElBCR.width || targetElement.offsetWidth
     };
 
     switch (placementPrimary) {

diff --git a/src/util/triggers.ts b/src/util/triggers.ts
@@ -9,7 +9,7 @@ export class Trigger {
 }
 
 const DEFAULT_ALIASES = {
-  hover: ['mouseenter', 'mouseleave']
+  'hover': ['mouseenter', 'mouseleave']
 };
 
 export function parseTriggers(triggers: string, aliases = DEFAULT_ALIASES): Trigger[] {