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

Fixes: U4-6599 TinyMCE autoresize plugin has a bug and needs to be updated, U4-5689 update to latest TinyMCE 4.x version

Browse Source
This commit is contained in:
Shannon
2015-06-17 15:06:34 +02:00
parent 4fcadc7e94
commit be84db097a
98 changed files with 52 additions and 2542 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -411,20 +411,56 @@ module.exports = function (grunt) {
},
bower: {
install: {
dev: {
dest: '<%= distdir %>/lib',
options: {
targetDir: "<%= distdir %>/lib",
cleanTargetDir: false,
layout: function (type, component, source) {
var path = require('path');
//this is the same as 'byComponent', however we will not allow
// folders with '.' in them since the grunt copy task does not like that
var componentWithoutPeriod = component.replace(".", "-");
return path.join(componentWithoutPeriod, type);
expand: true,
ignorePackages: ['blueimp-canvas-to-blob', 'blueimp-tmpl', 'bootstrap'],
packageSpecific: {
'typeahead.js': {
keepExpandedHierarchy: false
},
'underscore': {
files: ['underscore-min.js', 'underscore-min.map']
},
'rgrove-lazyload': {
files: ['lazyload.js']
},
'angular-dynamic-locale': {
files: ['tmhDynamicLocale.min.js,tmhDynamicLocale.min.js.map}']
},
'bootstrap-social': {
files: ['bootstrap-social.css']
},
'font-awesome': {
files: ['css/font-awesome.min.css', 'fonts/*']
},
'jquery': {
files: ['jquery.min.js', 'jquery.min.map']
},
'jquery-file-upload': {
keepExpandedHierarchy: false,
files: ['js/jquery.fileupload.js', 'js/jquery.fileupload-process.js', 'js/jquery.fileupload-angular.js', 'js/jquery.fileupload-image.js']
},
'jquery-ui': {
keepExpandedHierarchy: false,
files: ['ui/minified/jquery-ui.min.js']
},
'blueimp-load-image': {
keepExpandedHierarchy: false,
files: ['js/load-image.all.min.js']
},
'tinymce': {
files: ['plugins/**', 'themes/**', 'tinymce.min.js']
},
'angular-dynamic-locale': {
files: ['tmhDynamicLocale.min.js', 'tmhDynamicLocale.min.js.map']
}
}
}
},
options: {
expand: true
}
}
});
@@ -443,7 +479,7 @@ module.exports = function (grunt) {
grunt.loadNpmTasks('grunt-open');
grunt.loadNpmTasks('grunt-contrib-connect');
grunt.loadNpmTasks('grunt-bower-task');
grunt.loadNpmTasks('grunt-bower');
grunt.loadNpmTasks('grunt-ngdocs');
};