fix(range-ui): only allow num & don't show weeks

NCI-GDC · May 20, 2015 · 93f0675 · 93f0675
1 parent ee1c0dc
commit 93f0675
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 3 deletions.
diff --git a/app/index.html b/app/index.html
@@ -149,6 +149,7 @@
 <script src="libs/angular-drag-and-drop-lists/angular-drag-and-drop-lists.js"></script>
 <script src="libs/ng-tags-input/ng-tags-input.js"></script>
 <script src="libs/angular-lz-string/angular-lz-string.js"></script>
+<script src="libs/angular-input-masks/angular-input-masks.js"></script>
 <!-- endbuild -->
 
 <!-- App -->

diff --git a/app/scripts/app.ts b/app/scripts/app.ts
@@ -125,6 +125,7 @@ angular
       "gettext",
       "ngTagsInput",
       "lz-string",
+      "ui.utils.masks",
 
       "ngApp.core",
       "ngApp.search",

diff --git a/app/scripts/components/facets/facets.controllers.ts b/app/scripts/components/facets/facets.controllers.ts
@@ -307,6 +307,7 @@ module ngApp.components.facets.controllers {
           formatDayTitle: "MMMM YYYY",
           formatYear: "YYYY",
           formatMonthTitle: "YYYY",
+          showWeeks: false,
           startingDay: 1
       };
       this.name = $scope.name;

diff --git a/app/scripts/components/facets/templates/range-facet.html b/app/scripts/components/facets/templates/range-facet.html
@@ -12,9 +12,9 @@
   <div data-ng-show="!rfc.collapsed">
     <div class="input-group">
       <span class="input-group-addon">From:</span>
-      <input type="text" class="form-control" style="border-radius: 0px;" placeholder="{{ min }}" data-ng-model="lowerBound" aria-label="Min {{ field }}">
+      <input type="text" class="form-control" style="border-radius: 0px;" placeholder="{{ min }}" data-ng-model="lowerBound" aria-label="Min {{ field }}" data-ui-number-mask="0">
       <span class="input-group-addon" style="border-radius: 0px; border-right: 0px; border-left: 0px">To:</span>
-      <input type="text" class="form-control" style="border-radius: 0px" placeholder="{{ max }}" data-ng-model="upperBound" aria-label="Max {{ field }}">
+      <input type="text" class="form-control" style="border-radius: 0px" placeholder="{{ max }}" data-ng-model="upperBound" aria-label="Max {{ field }}" data-ui-number-mask="0">
       <span class="input-group-btn">
         <button class="btn btn-default" type="button" data-ng-click="rfc.setBounds()">Go!</button>
       </span>

diff --git a/bower.json b/bower.json
@@ -29,7 +29,8 @@
     "restangular": "1.5.1",
     "ng-table": "0.5.4",
     "lz-string": "1.3.4",
-    "angular-lz-string": "1.0.1"
+    "angular-lz-string": "1.0.1",
+    "angular-input-masks": "1.4.2"
   },
   "resolutions": {
     "angular": "1.3.5",