yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

grunt update to copy default files

Browse Source
This commit is contained in:
antoine
2014-05-21 15:37:20 +02:00
parent 3ffb2772b6
commit 0c8ff187aa
2 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/Umbraco.Web.UI.Client/gruntFile.js
View File

@@ -11,7 +11,7 @@ module.exports = function (grunt) {
grunt.registerTask('watch-html', ['copy:views', 'copy:vs']);
grunt.registerTask('watch-packages', ['copy:packages']);
grunt.registerTask('watch-installer', ['concat:install', 'concat:installJs', 'copy:installer', 'copy:vs']);
grunt.registerTask('watch-tuning', ['copy:tuning', 'concat:tuningJs', 'concat:tuningLess', 'copy:vs']);
grunt.registerTask('watch-tuning', ['copy:tuning', 'concat:tuningJs', 'copy:vs']);
grunt.registerTask('watch-test', ['jshint:dev', 'karma:unit']);
//triggered from grunt dev or grunt
@@ -134,9 +134,7 @@ module.exports = function (grunt) {
}
]
},
*/
installer: {
files: [{ dest: '<%= distdir %>/views/install', src : '**/*.html', expand: true, cwd: 'src/installer/steps' }]
},
@@ -144,7 +142,8 @@ module.exports = function (grunt) {
tuning: {
files: [
{ dest: '<%= distdir %>/preview', src: '**/*.html', expand: true, cwd: 'src/tuning' },
{ dest: '<%= distdir %>/assets/less', src: 'tuning.lessParameters.less', expand: true, cwd: 'src/tuning' },
{ dest: '<%= distdir %>/assets/css', src: 'tuning.defaultStyle.css', expand: true, cwd: 'src/tuning' },
{ dest: '<%= distdir %>/assets/less', src: 'tuning.defaultStyle.less', expand: true, cwd: 'src/tuning' },
{ dest: '<%= distdir %>/js', src: 'tuning.config.js', expand: true, cwd: 'src/tuning/config' },
{ dest: '<%= distdir %>/js', src: 'tuning.palettes.js', expand: true, cwd: 'src/tuning/config' },
{ dest: '<%= distdir %>/js', src: 'tuning.front.js', expand: true, cwd: 'src/tuning' }
@@ -216,10 +215,6 @@ module.exports = function (grunt) {
src: ['src/tuning/tuning.global.js', 'src/tuning/tuning.controller.js', 'src/tuning/lib/slider.directive.js', 'src/tuning/lib/spectrum.directive.js'],
dest: '<%= distdir %>/js/tuning.panel.js'
},
tuningLess: {
src: ['src/tuning/tuning.lessParameters.less', 'src/tuning/tuning.baseStyles.less', 'src/tuning/tuning.dynamicStyles.less'],
dest: '<%= distdir %>/assets/less/tuning.style.less',
},
controllers: {
src:['src/controllers/**/*.controller.js','src/views/**/*.controller.js'],
dest: '<%= distdir %>/js/umbraco.controllers.js',

6
src/Umbraco.Web.UI/Umbraco/js/tuning.panel.js
View File

@@ -44,7 +44,7 @@ var setFrameIsLoaded = function (tuningParameterUrl) {
console.info("iframe id loaded " + tuningParameterUrl);
var scope = angular.element($("#tuningPanel")).scope();
scope.tuningParameterUrl = tuningParameterUrl;
scope.frameLoaded ++;
scope.frameLoaded++;
scope.frameFirstLoaded = true;
scope.$apply();
}
@@ -87,7 +87,7 @@ angular.module("umbraco.tuning", ['ui.bootstrap', 'spectrumcolorpicker', 'ui.sli
var initTuning = function () {
console.info("url " + $scope.tuningParameterUrl);
$http.get('/Umbraco/Api/tuning/Load', { params: { param: $scope.tuningParameterUrl } })
.success(function (data) {
@@ -247,7 +247,7 @@ angular.module("umbraco.tuning", ['ui.bootstrap', 'spectrumcolorpicker', 'ui.sli
$('.btn-default-delete').attr("disabled", true);
$http.get('/Umbraco/Api/tuning/Delete', { params: { pageId: $location.search().id } })
.success(function (data) {
$scope.frameLoaded ++;
$scope.frameLoaded++;
$scope.pageId = $scope.pageId + "&n=123456";
$('.btn-default-delete').attr("disabled", false);
})