mirror/piskel
1
0
Fork 0
mirror of https://github.com/piskelapp/piskel.git synced 2023-08-10 21:12:52 +03:00
Code Issues Projects Releases Wiki Activity

Issue #344 : Avoid templating syntax conflict with Django

Browse Source
This commit is contained in:
jdescottes
2015-11-30 01:29:59 +01:00
parent 7e1451fa8d
commit 2b28577813
17 changed files with 45 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Gruntfile.js
View File

@@ -4,18 +4,16 @@ module.exports = function(grunt) {
var now = new Date();
var version = '-' + dateFormat(now, "yyyy-mm-dd-hh-MM");
var mapToSrcFolder = function (path) {
// get the list of scripts paths to include
var piskelScripts = require('./src/piskel-script-list.js').scripts.map(function (path) {
return "src/" + path;
};
var piskelScripts = require('./src/piskel-script-list.js').scripts.map(mapToSrcFolder).filter(function (path) {
}).filter(function (path) {
return path.indexOf('devtools') === -1;
});
var piskelStyles = require('./src/piskel-style-list.js').styles.map(mapToSrcFolder);
var mapToCasperFolder = function (path) {
return "test/casperjs/" + path;
};
// get the list of styles paths to include
var piskelStyles = require('./src/piskel-style-list.js').styles.map(function (path) {
return "src/" + path;
});
var casperEnvironments = {
'local' : {
@@ -30,7 +28,9 @@ module.exports = function(grunt) {
var getCasperConfig = function (env) {
var conf = casperEnvironments[env];
var tests = require(conf.suite).tests.map(mapToCasperFolder);
var tests = require(conf.suite).tests.map(function (path) {
return "test/casperjs/" + path;
});
return {
filesSrc : tests,
options : {
@@ -232,7 +232,7 @@ module.exports = function(grunt) {
},
files: [
// src/index.html should already have been moved by the includereplace task
{src: ['dest/index.html'], dest: 'dest/piskelapp-partials/main-partial.html'}
{src: ['dest-tmp/index.html'], dest: 'dest/piskelapp-partials/main-partial.html'}
]
}
},