--- a/.hgtags Wed Sep 09 15:18:53 2015 +0200
+++ b/.hgtags Thu Sep 10 16:22:28 2015 +0200
@@ -64,3 +64,4 @@
73141008167db81a0cd2deecaebc8b6b47c19023 V00.11
6f2ab1a72f4a610b0625b60698f43a0b9edc1a3d V00.12
444b80998255355583a58f6844ec1cb186a4e89d V00.12.01
+a509adc8ac1094da0ad1e8e901977c5ae7e40698 V00.12.02
--- a/client/bower.json Wed Sep 09 15:18:53 2015 +0200
+++ b/client/bower.json Thu Sep 10 16:22:28 2015 +0200
@@ -1,6 +1,6 @@
{
"name": "renkan",
- "version": "0.12.1",
+ "version": "0.12.2",
"authors": [
"IRI <dev@iri-research.org>"
],
--- a/client/gruntfile.js Wed Sep 09 15:18:53 2015 +0200
+++ b/client/gruntfile.js Thu Sep 10 16:22:28 2015 +0200
@@ -178,11 +178,16 @@
eqeqeq: true,
eqnull: true,
browser: true,
+ esnext: true,
globals: {
jQuery: true
},
},
- all: ['Gruntfile.js', 'js/**/*.js', 'data/simple-persist.js']
+ all: [
+ 'Gruntfile.js',
+ 'js/**/*.js',
+ 'data/simple-persist.js'
+ ]
},
bower: {
install: {
@@ -251,7 +256,48 @@
}
}
}
- }
+ },
+ replace: {
+ 'version-bower-package': {
+ src: ['package.json', 'bower.json'],
+ overwrite: true,
+ replacements: [{
+ from: /^(\s+)\"version\"\:\s*\"([\d\.]+)\"\,[ \t]*$/m,
+ to: "$1\"version\"\: \"<%= setversion.version %>\",",
+ }]
+ },
+ 'version-gradle': {
+ src: ['../server/java/build.gradle'],
+ overwrite: true,
+ replacements: [{
+ from: /^(\s+)version\s*\=\s*\'([\d\.]+)\'[ \t]*$/m,
+ to: "$1version = \'<%= setversion.version %>\'",
+ }]
+ },
+ 'version-maven': {
+ src: ['../server/java/pom.xml'],
+ overwrite: true,
+ replacements: [{
+ from: /^(\s+)<version>\s*([\d\.]+)\s*<\/version>[ \t]*$/m,
+ to: "$1<version><%= setversion.version %></version>",
+ }]
+ },
+ 'version-django': {
+ src: ['../server/python/django/renkanmanager/__init__.py'],
+ overwrite: true,
+ replacements: [{
+ from: /^(\s*)VERSION\s*=\s*\([ \t]*\d+[ \t]*,[ \t]*\d+[ \t]*,[ \t]*\d+[ \t]*,[ \t]*\"final\"[ \t]*\,[ \t]*0[ \t]*\)[ \t]*$/m,
+ to: function(matchedWord, index, fullText, regexMatches) {
+ var array_version = grunt.config.get('setversion.version').split('.');
+ var array_version_length = array_version.length;
+ for(let i=0;i<3-array_version_length;i++) {
+ array_version.push('0');
+ }
+ return regexMatches[0]+"VERSION = (" + array_version.join(', ') + ", \"final\", 0)";
+ },
+ }]
+ },
+ },
});
// Load the plugins.
@@ -267,6 +313,7 @@
grunt.loadNpmTasks('grunt-contrib-jst');
grunt.loadNpmTasks('grunt-contrib-watch');
grunt.loadNpmTasks('grunt-umd');
+ grunt.loadNpmTasks('grunt-text-replace');
// Default task(s).
grunt.registerTask('base', [
@@ -290,6 +337,10 @@
grunt.task.run(['copy:renkan_server']);
});
grunt.registerTask('dev', ['base', 'connect:server', 'watch']);
+ grunt.registerTask('set-version', function(version) {
+ grunt.config.set('setversion.version', version);
+ grunt.task.run(['replace:version-bower-package', 'replace:version-gradle', 'replace:version-maven', 'replace:version-django']);
+ });
};
--- a/client/js/main.js Wed Sep 09 15:18:53 2015 +0200
+++ b/client/js/main.js Thu Sep 10 16:22:28 2015 +0200
@@ -117,9 +117,9 @@
});
this.read_only = this.options.read_only || !this.options.editor_mode;
-
+
this.router = new Rkns.Router();
-
+
this.project = new Rkns.Models.Project();
this.dataloader = new Rkns.DataLoader.Loader(this.project, this.options);
@@ -563,8 +563,7 @@
_path.segments[4].point.y = _path.segments[5].point.y = _bottom;
_path.segments[1].point.y = _coords.y - _options.tooltip_arrow_width / 2;
_path.segments[6].point.y = _coords.y + _options.tooltip_arrow_width / 2;
- _path.closed = true;
- _path.fillColor = new paper.GradientColor(new paper.Gradient([_options.tooltip_top_color, _options.tooltip_bottom_color]), [0, _top], [0, _bottom]);
+ _path.fillColor = new paper.Color(new paper.Gradient([_options.tooltip_top_color, _options.tooltip_bottom_color]), [0, _top], [0, _bottom]);
_selector.css({
left: (_options.tooltip_padding + Math.min(_left, _right)),
top: (_options.tooltip_padding + _top)
--- a/client/package.json Wed Sep 09 15:18:53 2015 +0200
+++ b/client/package.json Thu Sep 10 16:22:28 2015 +0200
@@ -1,6 +1,6 @@
{
"name": "renkan",
- "version": "0.12.1",
+ "version": "0.12.2",
"description": "Renkan client application",
"repository": {
"type": "hg",
@@ -21,6 +21,7 @@
"grunt-contrib-requirejs": "^0.4.4",
"grunt-contrib-uglify": "^0.4.0",
"grunt-contrib-watch": "^0.6.1",
+ "grunt-text-replace": "^0.4.0",
"grunt-umd": "^2.3.3",
"jshint-stylish": "^0.2.0"
},
--- a/server/java/build.gradle Wed Sep 09 15:18:53 2015 +0200
+++ b/server/java/build.gradle Thu Sep 10 16:22:28 2015 +0200
@@ -2,7 +2,7 @@
apply plugin: 'maven'
group = 'org.iri_research.renkan'
- version = '0.12.1'
+ version = '0.12.2'
gradle.projectsEvaluated {
--- a/server/java/pom.xml Wed Sep 09 15:18:53 2015 +0200
+++ b/server/java/pom.xml Thu Sep 10 16:22:28 2015 +0200
@@ -5,7 +5,7 @@
<groupId>org.iri_research.renkan</groupId>
<artifactId>renkan</artifactId>
<packaging>pom</packaging>
- <version>0.12.1</version>
+ <version>0.12.2</version>
<name>Renkan project</name>
<modules>
--- a/server/python/django/renkanmanager/__init__.py Wed Sep 09 15:18:53 2015 +0200
+++ b/server/python/django/renkanmanager/__init__.py Thu Sep 10 16:22:28 2015 +0200
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-VERSION = (0, 12, 1, "final", 0)
+VERSION = (0, 12, 2, "final", 0)
def get_version():