Skip to content

Commit

Permalink
v0.8.4
Browse files Browse the repository at this point in the history
  • Loading branch information
Kibo committed Feb 15, 2018
1 parent 51b7d17 commit 9f8fb23
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 7 deletions.
6 changes: 5 additions & 1 deletion gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,11 @@ module.exports = function( grunt ) {
},
}
});


grunt.registerTask( 'default', [
"dev",
"watch"
]);
grunt.registerTask('dev', ['jshint', 'concat']);
grunt.registerTask('build', ['concat', 'uglify', 'qunit']);
grunt.registerTask('test', ['qunit']);
Expand Down
13 changes: 10 additions & 3 deletions project/build/astrochart.js
Original file line number Diff line number Diff line change
Expand Up @@ -2058,7 +2058,14 @@

var line = this.paper.line( startPoint.x, startPoint.y, endPoint.x, endPoint.y);
line.setAttribute("stroke", astrology.STROKE_ONLY ? astrology.LINE_COLOR : aspectsList[i].aspect.color);
line.setAttribute("stroke-width", (astrology.CUSPS_STROKE * astrology.SYMBOL_SCALE));
line.setAttribute("stroke-width", (astrology.CUSPS_STROKE * astrology.SYMBOL_SCALE));

line.setAttribute("data-name", aspectsList[i].aspect.name);
line.setAttribute("data-degree", aspectsList[i].aspect.degree);
line.setAttribute("data-point", aspectsList[i].point.name);
line.setAttribute("data-toPoint", aspectsList[i].toPoint.name);
line.setAttribute("data-precision", aspectsList[i].precision);

wrapper.appendChild( line );
}
}
Expand Down Expand Up @@ -2492,7 +2499,7 @@
*
* @param {Object} points; {"Sun":[0], "Moon":[90]}
*
* @return {Array<Object>} [{"aspect":{"name":"conjunction", "angle":120}"", "point":{"name":"Sun", "position":123}, "toPoint":{"name":"Moon", "position":345}, "precision":0.5}]]
* @return {Array<Object>} [{"aspect":{"name":"conjunction", "degree":120}"", "point":{"name":"Sun", "position":123}, "toPoint":{"name":"Moon", "position":345}, "precision":0.5}]]
*/
astrology.AspectCalculator.prototype.radix = function( points ){
if(!points){
Expand Down Expand Up @@ -2535,7 +2542,7 @@
* Transit aspects
*
* @param {Object} points - transiting points; {"Sun":[0, 1], "Uranus":[90, -1], "NAME":[ANGLE, SPEED]};
* @return {Array<Object>} [{"aspect":"conjunction", "point":"Sun", "toPoint":"Moon", "precision":0.5}]]
* @return {Array<Object>} [{"aspect":{"name":"conjunction", "degree":120}"", "point":{"name":"Sun", "position":123}, "toPoint":{"name":"Moon", "position":345}, "precision":0.5}]]
*/
astrology.AspectCalculator.prototype.transit = function( points ){
if(!points){
Expand Down
4 changes: 2 additions & 2 deletions project/src/aspect.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
*
* @param {Object} points; {"Sun":[0], "Moon":[90]}
*
* @return {Array<Object>} [{"aspect":{"name":"conjunction", "angle":120}"", "point":{"name":"Sun", "position":123}, "toPoint":{"name":"Moon", "position":345}, "precision":0.5}]]
* @return {Array<Object>} [{"aspect":{"name":"conjunction", "degree":120}"", "point":{"name":"Sun", "position":123}, "toPoint":{"name":"Moon", "position":345}, "precision":0.5}]]
*/
astrology.AspectCalculator.prototype.radix = function( points ){
if(!points){
Expand Down Expand Up @@ -89,7 +89,7 @@
* Transit aspects
*
* @param {Object} points - transiting points; {"Sun":[0, 1], "Uranus":[90, -1], "NAME":[ANGLE, SPEED]};
* @return {Array<Object>} [{"aspect":"conjunction", "point":"Sun", "toPoint":"Moon", "precision":0.5}]]
* @return {Array<Object>} [{"aspect":{"name":"conjunction", "degree":120}"", "point":{"name":"Sun", "position":123}, "toPoint":{"name":"Moon", "position":345}, "precision":0.5}]]
*/
astrology.AspectCalculator.prototype.transit = function( points ){
if(!points){
Expand Down
9 changes: 8 additions & 1 deletion project/src/radix.js
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,14 @@

var line = this.paper.line( startPoint.x, startPoint.y, endPoint.x, endPoint.y);
line.setAttribute("stroke", astrology.STROKE_ONLY ? astrology.LINE_COLOR : aspectsList[i].aspect.color);
line.setAttribute("stroke-width", (astrology.CUSPS_STROKE * astrology.SYMBOL_SCALE));
line.setAttribute("stroke-width", (astrology.CUSPS_STROKE * astrology.SYMBOL_SCALE));

line.setAttribute("data-name", aspectsList[i].aspect.name);
line.setAttribute("data-degree", aspectsList[i].aspect.degree);
line.setAttribute("data-point", aspectsList[i].point.name);
line.setAttribute("data-toPoint", aspectsList[i].toPoint.name);
line.setAttribute("data-precision", aspectsList[i].precision);

wrapper.appendChild( line );
}
}
Expand Down

0 comments on commit 9f8fb23

Please sign in to comment.