Skip to content

Commit 59b3e68

Browse files
author
Per Ploug Krogslund
committed
Moving css and js files around - updating to angular 1.2
1 parent 85e160a commit 59b3e68

File tree

403 files changed

+1591
-81386
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

403 files changed

+1591
-81386
lines changed

‎src/Umbraco.Web.UI.Client/bower.json

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,15 @@
1717
],
1818
"dependencies": {
1919
"typeahead.js": "~0.10.2",
20-
"angular": "~1.2.18",
21-
"angular-route": "~1.2.18",
22-
"angular-touch": "~1.2.18",
23-
"rgrove-lazyload": "*"
20+
"angular": "~1.2.20",
21+
"angular-route": "~1.2.20",
22+
"angular-touch": "~1.2.20",
23+
"angular-mocks": "~1.2.20",
24+
"angular-cookies": "~1.2.20",
25+
"angular-sanitize": "~1.2.20",
26+
"angular-animate": "~1.2.20",
27+
"rgrove-lazyload": "*",
28+
"animate.css": "3.2.0",
29+
"lodash": "~2.4.1"
2430
}
2531
}

‎src/Umbraco.Web.UI.Client/gruntFile.js

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ module.exports = function (grunt) {
103103
app: ['src/views/**/*.html'],
104104
common: ['src/common/**/*.tpl.html']
105105
},
106-
less: ['src/less/belle.less'], // recess:build doesn't accept ** in its file patterns
106+
less: ['src/less/umbraco.less'], // recess:build doesn't accept ** in its file patterns
107107
prod: ['<%= distdir %>/js/*.js']
108108
},
109109

@@ -125,6 +125,34 @@ module.exports = function (grunt) {
125125
{
126126
dest: '<%= distdir %>/lib/lazyload/lazyload.min.js',
127127
src: 'bower_components/rgrove-lazyload/lazyload.js'
128+
},
129+
{
130+
dest: '<%= distdir %>/lib/angular/1.2/angular.min.js',
131+
src: 'bower_components/angular/angular.js'
132+
},
133+
{
134+
dest: '<%= distdir %>/lib/angular/1.2/angular-route.min.js',
135+
src: 'bower_components/angular-route/angular-route.js'
136+
},
137+
{
138+
dest: '<%= distdir %>/lib/angular/1.2/angular-touch.min.js',
139+
src: 'bower_components/angular-touch/angular-touch.js'
140+
},
141+
{
142+
dest: '<%= distdir %>/lib/angular/1.2/angular-cookies.min.js',
143+
src: 'bower_components/angular-cookies/angular-cookies.js'
144+
},
145+
{
146+
dest: '<%= distdir %>/lib/angular/1.2/angular-mocks.js',
147+
src: 'bower_components/angular-mocks/angular-mocks.js'
148+
},
149+
{
150+
dest: '<%= distdir %>/lib/angular/1.2/angular-sanitize.min.js',
151+
src: 'bower_components/angular-sanitize/angular-sanitize.js'
152+
},
153+
{
154+
dest: '<%= distdir %>/lib/angular/1.2/angular-animate.min.js',
155+
src: 'bower_components/angular-animate/angular-animate.js'
128156
}
129157
]
130158
},

‎src/Umbraco.Web.UI.Client/lib/angular-bootstrap/ui-bootstrap-tpls-0.10.0.min.js

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎src/Umbraco.Web.UI.Client/lib/angular/1.1.5/angular-cookies.js

Lines changed: 0 additions & 185 deletions
This file was deleted.

‎src/Umbraco.Web.UI.Client/lib/angular/1.1.5/angular-cookies.min.js

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)