From 636e5c375ecc859cb2e66904dbe942bcac53de3b Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Fri, 7 Aug 2015 09:35:44 -0400
Subject: [PATCH] (js) Merge utils.js to Common.js

---
 UI/Templates/UIxPageFrame.wox            | 11 +++++------
 UI/WebServerResources/Gruntfile.js       |  2 +-
 UI/WebServerResources/js/Common/utils.js | 12 +++++-------
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/UI/Templates/UIxPageFrame.wox b/UI/Templates/UIxPageFrame.wox
index 77d1b979b..cfae97ceb 100644
--- a/UI/Templates/UIxPageFrame.wox
+++ b/UI/Templates/UIxPageFrame.wox
@@ -228,13 +228,12 @@
             <var:string value="productLocalizableStrings" const:escapeHTML="NO" />
           </script>
           <script type="text/javascript" rsrc:src="js/vendor/lodash.min.js"><!-- space --></script>
-          <script type="text/javascript" rsrc:src="js/vendor/angular.js"><!-- space --></script>
-          <script type="text/javascript" rsrc:src="js/vendor/angular-animate.js"><!-- space --></script>
-          <script type="text/javascript" rsrc:src="js/vendor/angular-sanitize.js"><!-- space --></script>
-          <script type="text/javascript" rsrc:src="js/vendor/angular-aria.js"><!-- space --></script>
+          <script type="text/javascript" rsrc:src="js/vendor/angular.min.js"><!-- space --></script>
+          <script type="text/javascript" rsrc:src="js/vendor/angular-animate.min.js"><!-- space --></script>
+          <script type="text/javascript" rsrc:src="js/vendor/angular-sanitize.min.js"><!-- space --></script>
+          <script type="text/javascript" rsrc:src="js/vendor/angular-aria.min.js"><!-- space --></script>
           <script type="text/javascript" rsrc:src="js/vendor/angular-material.js"><!-- space --></script>
-          <script type="text/javascript" rsrc:src="js/vendor/angular-ui-router.js"><!-- space --></script>
-          <script type="text/javascript" rsrc:src="js/Common/utils.js"><!-- space --></script>
+          <script type="text/javascript" rsrc:src="js/vendor/angular-ui-router.min.js"><!-- space --></script>
 
           <var:if condition="hasProductSpecificJavaScript">
             <script type="text/javascript"
diff --git a/UI/WebServerResources/Gruntfile.js b/UI/WebServerResources/Gruntfile.js
index 702db80fc..266895c53 100644
--- a/UI/WebServerResources/Gruntfile.js
+++ b/UI/WebServerResources/Gruntfile.js
@@ -1,6 +1,6 @@
 module.exports = function(grunt) {
   var js_files = {
-    'js/Common.js': ['js/Common/Common.app.js', 'js/Common/*.filter.js', 'js/Common/*Controller.js', 'js/Common/*.service.js', 'js/Common/*.directive.js'],
+    'js/Common.js': ['js/Common/Common.app.js', 'js/Common/*.filter.js', 'js/Common/*Controller.js', 'js/Common/*.service.js', 'js/Common/*.directive.js', 'js/Common/utils.js'],
     'js/Scheduler.services.js': ['js/Scheduler/*.service.js'],
     'js/Scheduler.js': ['js/Scheduler.app.js', 'js/Scheduler/*Controller.js', 'js/Scheduler/*.directive.js'],
     'js/Contacts.services.js': ['js/Contacts/*.service.js'],
diff --git a/UI/WebServerResources/js/Common/utils.js b/UI/WebServerResources/js/Common/utils.js
index 2014c73cb..8d3417d4b 100644
--- a/UI/WebServerResources/js/Common/utils.js
+++ b/UI/WebServerResources/js/Common/utils.js
@@ -80,7 +80,7 @@ String.prototype.md5 = function() {
 
 String.prototype.capitalize = function() {
   return this.charAt(0).toUpperCase() + this.slice(1);
-}
+};
 
 String.prototype.asDate = function () {
     var newDate;
@@ -129,7 +129,7 @@ String.prototype.formatTime = function(hours, minutes) {
 };
 
 Date.prototype.daysUpTo = function(otherDate) {
-    var days = new Array();
+    var days = [];
 
     var day1 = this.getTime();
     var day2 = otherDate.getTime();
@@ -155,10 +155,8 @@ String.prototype.isValidEmail = function() {
 };
 
 String.prototype.asCSSIdentifier = function() {
-  var characters = [ '_'  , '\\.', '#'  , '@'  , '\\*', ':'  , ','   , ' '
-                     , "'", '&', '\\+' ];
-  var escapeds =   [ '_U_', '_D_', '_H_', '_A_', '_S_', '_C_', '_CO_',
-                     '_SP_', '_SQ_', '_AM_', '_P_' ];
+  var characters = [ '_'  , '\\.', '#'  , '@'  , '\\*', ':'  , ','   , ' ',    "'",    '&',    '\\+' ];
+  var escapeds =   [ '_U_', '_D_', '_H_', '_A_', '_S_', '_C_', '_CO_', '_SP_', '_SQ_', '_AM_', '_P_' ];
 
   var newString = this;
   for (var i = 0; i < characters.length; i++) {
@@ -231,7 +229,7 @@ Date.prototype.beginOfDay = function() {
     beginOfDay.setMilliseconds(0);
 
     return beginOfDay;
-}
+};
 
 Date.prototype.beginOfWeek = function() {
     var offset = firstDayOfWeek - this.getDay();