Skip to content
This repository was archived by the owner on Jul 17, 2023. It is now read-only.

Commit e973f7d

Browse files
committed
GUAC-1172: Upgrade to Angular 1.3.16. Update form template to work around angular/angular.js#12260.
1 parent 7a88c98 commit e973f7d

File tree

8 files changed

+944
-568
lines changed

8 files changed

+944
-568
lines changed

guacamole/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,10 +157,10 @@
157157
<jsSourceFiles>
158158
<jsSourceFile>lib/jquery.js</jsSourceFile>
159159
<jsSourceFile>lib/lodash.js</jsSourceFile>
160-
<jsSourceFile>lib/angular.js</jsSourceFile>
160+
<jsSourceFile>lib/angular.min.js</jsSourceFile>
161161
<jsSourceFile>lib/angular-module-shim.js</jsSourceFile>
162162
<jsSourceFile>lib/angular-touch.js</jsSourceFile>
163-
<jsSourceFile>lib/plugins/angular-cookies.min.js</jsSourceFile>
163+
<jsSourceFile>lib/plugins/angular-cookies.js</jsSourceFile>
164164
<jsSourceFile>lib/plugins/angular-route.js</jsSourceFile>
165165
<jsSourceFile>lib/plugins/angular-translate.js</jsSourceFile>
166166
<jsSourceFile>lib/plugins/angular-translate-loader-static-files.js</jsSourceFile>
Lines changed: 28 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,35 @@
1-
<div ng-repeat="form in forms" class="form">
2-
<!--
3-
Copyright 2015 Glyptodon LLC.
1+
<div class="form-group">
2+
<div ng-repeat="form in forms" class="form">
3+
<!--
4+
Copyright 2015 Glyptodon LLC.
45
5-
Permission is hereby granted, free of charge, to any person obtaining a copy
6-
of this software and associated documentation files (the "Software"), to deal
7-
in the Software without restriction, including without limitation the rights
8-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9-
copies of the Software, and to permit persons to whom the Software is
10-
furnished to do so, subject to the following conditions:
6+
Permission is hereby granted, free of charge, to any person obtaining a copy
7+
of this software and associated documentation files (the "Software"), to deal
8+
in the Software without restriction, including without limitation the rights
9+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
10+
copies of the Software, and to permit persons to whom the Software is
11+
furnished to do so, subject to the following conditions:
1112
12-
The above copyright notice and this permission notice shall be included in
13-
all copies or substantial portions of the Software.
13+
The above copyright notice and this permission notice shall be included in
14+
all copies or substantial portions of the Software.
1415
15-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
21-
THE SOFTWARE.
22-
-->
16+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
17+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
18+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
19+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
20+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
21+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
22+
THE SOFTWARE.
23+
-->
2324

24-
<!-- Form name -->
25-
<h3 ng-show="form.name">{{getSectionHeader(form) | translate}}</h3>
25+
<!-- Form name -->
26+
<h3 ng-show="form.name">{{getSectionHeader(form) | translate}}</h3>
2627

27-
<!-- All fields in form -->
28-
<div class="fields">
29-
<guac-form-field ng-repeat="field in form.fields" namespace="namespace"
30-
field="field" model="values[field.name]"></guac-form-field>
31-
</div>
28+
<!-- All fields in form -->
29+
<div class="fields">
30+
<guac-form-field ng-repeat="field in form.fields" namespace="namespace"
31+
field="field" model="values[field.name]"></guac-form-field>
32+
</div>
3233

34+
</div>
3335
</div>

0 commit comments

Comments
 (0)