Mercurial > wikked
changeset 109:f0172c5d8e2c
Better `Gruntfile` dev support.
author | Ludovic Chabant <ludovic@chabant.com> |
---|---|
date | Tue, 12 Nov 2013 13:54:29 -0800 |
parents | 5c24e8f8b095 |
children | 827e236aa7c6 |
files | Gruntfile.js wikked/web.py |
diffstat | 2 files changed, 4 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/Gruntfile.js Tue Nov 12 13:52:01 2013 -0800 +++ b/Gruntfile.js Tue Nov 12 13:54:29 2013 -0800 @@ -72,12 +72,8 @@ }, watch: { scripts: { - files: ['static/js/**/*.js'], - tasks: ['jshint', 'requirejs:development'] - }, - templates: { - files: ['static/tpl/**/*.html'], - tasks: ['requirejs:development'] + files: ['static/js/**/*.js', 'static/tpl/**/*.html'], + tasks: ['jshint', 'copy:development'] }, styles: { files: ['static/css/**/*.less'],
--- a/wikked/web.py Tue Nov 12 13:52:01 2013 -0800 +++ b/wikked/web.py Tue Nov 12 13:54:29 2013 -0800 @@ -54,7 +54,8 @@ # SQLAlchemy extension. from flask.ext.sqlalchemy import SQLAlchemy # TODO: get the path from the wiki parameters -app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:///' + os.path.join(wiki_root, '.wiki', 'wiki.db') +app.config['SQLALCHEMY_DATABASE_URI'] = ('sqlite:///' + + os.path.join(wiki_root, '.wiki', 'wiki.db')) db = SQLAlchemy(app)