GUAC-1172: Upgrade to Angular 1.3

guacamole/pom.xml

@@ -157,10 +157,10 @@
                             <jsSourceFiles>
                                 <jsSourceFile>lib/jquery.js</jsSourceFile>
                                 <jsSourceFile>lib/lodash.js</jsSourceFile>
-                                <jsSourceFile>lib/angular.js</jsSourceFile>
+                                <jsSourceFile>lib/angular.min.js</jsSourceFile>
                                 <jsSourceFile>lib/angular-module-shim.js</jsSourceFile>
                                 <jsSourceFile>lib/angular-touch.js</jsSourceFile>
-                                <jsSourceFile>lib/plugins/angular-cookies.min.js</jsSourceFile>
+                                <jsSourceFile>lib/plugins/angular-cookies.js</jsSourceFile>
                                 <jsSourceFile>lib/plugins/angular-route.js</jsSourceFile>
                                 <jsSourceFile>lib/plugins/angular-translate.js</jsSourceFile>
                                 <jsSourceFile>lib/plugins/angular-translate-loader-static-files.js</jsSourceFile>

guacamole/src/main/webapp/app/client/templates/guacFileTransfer.html

@@ -25,7 +25,9 @@
     <div class="filename">{{transfer.filename}}</div>
 
     <!-- Progress/status text -->
-    <div class="text">{{'CLIENT.TEXT_FILE_TRANSFER_PROGRESS' | translate:'{PROGRESS: getProgressValue(), UNIT: getProgressUnit()}'}}</div>
+    <div class="text"
+         translate="CLIENT.TEXT_FILE_TRANSFER_PROGRESS"
+         translate-values="{PROGRESS: getProgressValue(), UNIT: getProgressUnit()}"></div>
 
     <!-- Progress bar -->
     <div class="progress"><div ng-style="{'width': getPercentDone() + '%'}" class="bar"></div></div>

guacamole/src/main/webapp/app/form/templates/form.html

@@ -1,33 +1,35 @@
-<div ng-repeat="form in forms" class="form">
-    <!--
-        Copyright 2015 Glyptodon LLC.
+<div class="form-group">
+    <div ng-repeat="form in forms" class="form">
+        <!--
+            Copyright 2015 Glyptodon LLC.
 
-        Permission is hereby granted, free of charge, to any person obtaining a copy
-        of this software and associated documentation files (the "Software"), to deal
-        in the Software without restriction, including without limitation the rights
-        to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-        copies of the Software, and to permit persons to whom the Software is
-        furnished to do so, subject to the following conditions:
+            Permission is hereby granted, free of charge, to any person obtaining a copy
+            of this software and associated documentation files (the "Software"), to deal
+            in the Software without restriction, including without limitation the rights
+            to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+            copies of the Software, and to permit persons to whom the Software is
+            furnished to do so, subject to the following conditions:
 
-        The above copyright notice and this permission notice shall be included in
-        all copies or substantial portions of the Software.
+            The above copyright notice and this permission notice shall be included in
+            all copies or substantial portions of the Software.
 
-        THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-        IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-        FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-        AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-        LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-        OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-        THE SOFTWARE.
-    -->
+            THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+            IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+            FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+            AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+            LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+            OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+            THE SOFTWARE.
+        -->
 
-    <!-- Form name -->
-    <h3 ng-show="form.name">{{getSectionHeader(form) | translate}}</h3>
+        <!-- Form name -->
+        <h3 ng-show="form.name">{{getSectionHeader(form) | translate}}</h3>
 
-    <!-- All fields in form -->
-    <div class="fields">
-        <guac-form-field ng-repeat="field in form.fields" namespace="namespace"
-                         field="field" model="values[field.name]"></guac-form-field>
-    </div>
+        <!-- All fields in form -->
+        <div class="fields">
+            <guac-form-field ng-repeat="field in form.fields" namespace="namespace"
+                             field="field" model="values[field.name]"></guac-form-field>
+        </div>
 
+    </div>
 </div>

guacamole/src/main/webapp/app/home/templates/connection.html

@@ -32,9 +32,9 @@
         <span class="name">{{item.name}}</span>
 
         <!-- Active user count -->
-        <span class="activeUserCount" ng-show="item.getActiveConnections()">
-            {{'HOME.INFO_ACTIVE_USER_COUNT' | translate:'{USERS: item.getActiveConnections()}'}}
-        </span>
+        <span class="activeUserCount" ng-show="item.getActiveConnections()"
+            translate="HOME.INFO_ACTIVE_USER_COUNT"
+            translate-values="{USERS: item.getActiveConnections()}"></span>
 
     </div>
 </a>

guacamole/src/main/webapp/app/index/config/indexTranslationConfig.js

@@ -36,6 +36,9 @@ angular.module('index').config(['$injector', function($injector) {
     $translateProvider.fallbackLanguage(fallbackLanguages);
     $translateProvider.preferredLanguage(preferenceServiceProvider.preferences.language);
 
+    // Escape any HTML in translation strings
+    $translateProvider.useSanitizeValueStrategy('escape');
+
     // Load translations via translationLoader service
     $translateProvider.useLoader('translationLoader', {
         fallbackLanguages : fallbackLanguages

guacamole/src/main/webapp/app/login/directives/login.js

@@ -77,7 +77,7 @@ angular.module('login').directive('guacLogin', [function guacLogin() {
          *
          * @type String
          */
-        $scope.loginError = false;
+        $scope.loginError = null;
 
         /**
          * All form values entered by the user, as parameter name/value pairs.

guacamole/src/main/webapp/app/manage/templates/manageConnection.html

@@ -96,7 +96,9 @@ <h2 class="header">{{'MANAGE_CONNECTION.SECTION_HEADER_HISTORY' | translate}}</h
                 <tr ng-repeat="wrapper in wrapperPage">
                     <td class="username">{{wrapper.entry.username}}</td>
                     <td class="start">{{wrapper.entry.startDate | date:historyDateFormat}}</td>
-                    <td class="duration">{{wrapper.durationText | translate:"{VALUE: wrapper.duration.value, UNIT: wrapper.duration.unit}"}}</td>
+                    <td class="duration"
+                        translate="{{wrapper.durationText}}"
+                        translate-values="{VALUE: wrapper.duration.value, UNIT: wrapper.duration.unit}"></td>
                 </tr>
             </tbody>
         </table>

guacamole/src/main/webapp/app/notification/templates/guacNotification.html

@@ -32,10 +32,16 @@
         <p ng-show="notification.text" class="text">{{notification.text | translate}}</p>
 
         <!-- Current progress -->
-        <div ng-show="notification.progress" class="progress"><div ng-show="progressPercent" ng-style="{'width': progressPercent + '%'}" class="bar"></div><div ng-show="notification.progress.text" class="text">{{notification.progress.text | translate:"{ PROGRESS: notification.progress.value, UNIT: notification.progress.unit}"}}</div></div>
+        <div class="progress" ng-show="notification.progress"><div class="bar" ng-show="progressPercent" ng-style="{'width': progressPercent + '%'}"></div><div
+                ng-show="notification.progress.text"
+                translate="{{notification.progress.text}}"
+                translate-values="{PROGRESS: notification.progress.value, UNIT: notification.progress.unit}"></div></div>
 
         <!-- Default action countdown text -->
-        <p ng-show="notification.countdown.text" class="countdown-text">{{notification.countdown.text | translate:"{ REMAINING: timeRemaining}"}}</p>
+        <p class="countdown-text"
+           ng-show="notification.countdown.text"
+           translate="{{notification.countdown.text}}"
+           translate-values="{REMAINING: timeRemaining}"></p>
 
     </div>
 

guacamole/src/main/webapp/app/settings/templates/connection.html

@@ -32,9 +32,9 @@
         <span class="name">{{item.name}}</span>
 
         <!-- Active user count -->
-        <span class="activeUserCount" ng-show="item.getActiveConnections()">
-            {{'SETTINGS_CONNECTIONS.INFO_ACTIVE_USER_COUNT' | translate:'{USERS: item.getActiveConnections()}'}}
-        </span>
+        <span class="activeUserCount" ng-show="item.getActiveConnections()"
+            translate="SETTINGS_CONNECTIONS.INFO_ACTIVE_USER_COUNT"
+            translate-values="{USERS: item.getActiveConnections()}"></span>
 
     </div>
 </a>