lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge branch '1.9.x' of https://github.com/OrchardCMS/Orchard into 1.9.x

Browse Source
This commit is contained in:
Sebastien Ros
2015-07-20 14:31:33 -07:00
parent 1664aa1bde 5d09053d30
commit e6211dbf54
3 changed files with 54 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Orchard.Web/Modules/Orchard.Autoroute/Handlers/AutoroutePartHandler.cs
View File

@@ -66,6 +66,10 @@ namespace Orchard.Autoroute.Handlers {
if (current != null) {
current.CustomPattern = String.Empty; // force the regeneration
current.DisplayAlias = _autorouteService.Value.GenerateAlias(current);
// we changed the alias of the previous homepage, so publish this change if the content item was published.
if(current.IsPublished())
_orchardServices.ContentManager.Publish(current.ContentItem);
}
_autorouteService.Value.PublishAlias(current);
}

40
src/Orchard.Web/Modules/Orchard.DynamicForms/gulpfile.js
View File

@@ -14,12 +14,12 @@
var gulp = require("gulp"),
newer = require("gulp-newer"),
minify = require("gulp-minify-css"),
uglify = require("gulp-uglify"),
rename = require("gulp-rename"),
concat = require("gulp-concat"),
minify = require("gulp-minify-css"),
uglify = require("gulp-uglify"),
rename = require("gulp-rename"),
concat = require("gulp-concat"),
sourcemaps = require("gulp-sourcemaps"),
merge = require("merge-stream");
merge = require("merge-stream");
/*
* General tasks.
@@ -43,11 +43,11 @@ var srcCss = [
gulp.task("buildCss", function () {
return gulp.src(srcCss)
.pipe(minify())
.pipe(rename({
suffix: ".min"
}))
.pipe(gulp.dest("Styles"));
.pipe(minify())
.pipe(rename({
suffix: ".min"
}))
.pipe(gulp.dest("Styles"));
});
gulp.task("watchCss", function () {
@@ -62,9 +62,9 @@ gulp.task("watchCss", function () {
*/
var srcJsLib = [
"Scripts/Lib/jquery.validate.js",
"Scripts/Lib/jquery.validate.unobtrusive.additional.js",
"Scripts/Lib/jquery.validate.unobtrusive.js"
"Scripts/Lib/jquery.validate.js",
"Scripts/Lib/jquery.validate.unobtrusive.additional.js",
"Scripts/Lib/jquery.validate.unobtrusive.js"
];
var srcJsLayoutEditor = [
@@ -90,12 +90,12 @@ function jsPipelineFrom(inputStream, outputFolder, outputFile) {
return inputStream
.pipe(newer(outputFolder + "/" + outputFile))
.pipe(sourcemaps.init())
.pipe(concat(outputFile))
.pipe(concat(outputFile))
.pipe(sourcemaps.write())
.pipe(gulp.dest(outputFolder))
.pipe(uglify())
.pipe(rename({
suffix: ".min"
}))
.pipe(gulp.dest(outputFolder));
.pipe(gulp.dest(outputFolder))
.pipe(uglify())
.pipe(rename({
suffix: ".min"
}))
.pipe(gulp.dest(outputFolder));
}

60
src/Orchard.Web/Modules/Orchard.Layouts/gulpfile.js
View File

@@ -14,15 +14,15 @@
var gulp = require("gulp"),
newer = require("gulp-newer"),
plumber = require("gulp-plumber"),
plumber = require("gulp-plumber"),
sourcemaps = require("gulp-sourcemaps"),
less = require("gulp-less"),
autoprefixer = require("gulp-autoprefixer"),
minify = require("gulp-minify-css"),
uglify = require("gulp-uglify"),
rename = require("gulp-rename"),
concat = require("gulp-concat"),
merge = require("merge-stream")
autoprefixer = require("gulp-autoprefixer"),
minify = require("gulp-minify-css"),
uglify = require("gulp-uglify"),
rename = require("gulp-rename"),
concat = require("gulp-concat"),
merge = require("merge-stream")
/*
* General tasks.
@@ -72,18 +72,18 @@ gulp.task("watchLess", function () {
function lessPipelineFrom(inputStream, outputFolder, outputFile) {
return inputStream
.pipe(newer(outputFolder + "/" + outputFile))
.pipe(plumber())
.pipe(plumber())
.pipe(sourcemaps.init())
.pipe(less())
.pipe(concat(outputFile))
.pipe(autoprefixer({ browsers: ["last 2 versions"] }))
.pipe(less())
.pipe(concat(outputFile))
.pipe(autoprefixer({ browsers: ["last 2 versions"] }))
.pipe(sourcemaps.write())
.pipe(gulp.dest(outputFolder))
.pipe(minify())
.pipe(rename({
suffix: ".min"
}))
.pipe(gulp.dest(outputFolder));
.pipe(gulp.dest(outputFolder))
.pipe(minify())
.pipe(rename({
suffix: ".min"
}))
.pipe(gulp.dest(outputFolder));
}
/*
@@ -91,11 +91,11 @@ function lessPipelineFrom(inputStream, outputFolder, outputFile) {
*/
var srcJsLib = [
"Scripts/Lib/underscore.js",
"Scripts/Lib/angular.js",
"Scripts/Lib/angular-sanitize.js",
"Scripts/Lib/angular-resource.js",
"Scripts/Lib/sortable.js"
"Scripts/Lib/underscore.js",
"Scripts/Lib/angular.js",
"Scripts/Lib/angular-sanitize.js",
"Scripts/Lib/angular-resource.js",
"Scripts/Lib/sortable.js"
];
var srcJsLayoutEditor = [
@@ -146,14 +146,14 @@ gulp.task("watchJs", function () {
function jsPipelineFrom(inputStream, outputFolder, outputFile) {
return inputStream
.pipe(newer(outputFolder + "/" + outputFile))
.pipe(plumber())
.pipe(plumber())
.pipe(sourcemaps.init())
.pipe(concat(outputFile))
.pipe(concat(outputFile))
.pipe(sourcemaps.write())
.pipe(gulp.dest(outputFolder))
.pipe(uglify())
.pipe(rename({
suffix: ".min"
}))
.pipe(gulp.dest(outputFolder));
.pipe(gulp.dest(outputFolder))
.pipe(uglify())
.pipe(rename({
suffix: ".min"
}))
.pipe(gulp.dest(outputFolder));
}