Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'devel' of github.com:arangodb/arangodb into devel

This commit is contained in:
Michael Hackstein 2015-03-10 14:00:43 +01:00
parent fbb5d02b2c 4d3ed90778
commit d0a43227fb
4 changed files with 38 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
CHANGELOG
View File

@ -22,6 +22,12 @@ v2.6.0 (XXXX-XX-XX)
* fixed issue #1258: http pipelining not working?
v2.5.0-beta4 (2015-03-05)
-------------------------
* fixed issue #1247: debian init script problems
v2.5.0-beta3 (2015-02-27)
-------------------------
@ -327,10 +333,16 @@ v2.5.0-beta1 (2015-02-23)
* improve error reports in cluster
* Standard Errors can now contain custom messages.
* Standard errors can now contain custom messages.
v2.4.4 (2015-XX-XX)
v2.4.5 (XXXX-XX-XX)
-------------------
* fixed comment parsing in Foxx controllers
v2.4.4 (2015-02-24)
-------------------
* fixed the generation template for foxx apps. It now does not create deprecated functions anymore

4
js/apps/system/_admin/aardvark/APP/clusterFrontend/build/style.css
View File

@ -4840,6 +4840,10 @@ pre.gv-object-view {
margin-right: 24px;
width: 360px; }
#control_event_node_edit_modal, #control_event_edge_edit_modal, #control_event_node_delete_modal, #control_event_edge_delete_modal, #control_event_new_node_modal {
width: 640px;
margin-left: -320px; }
.scenarioImage {
height: 70%;
width: auto; }

9
js/apps/system/_admin/aardvark/APP/frontend/scss/_modals.scss
View File

@ -344,3 +344,12 @@ pre.gv-object-view {
margin-right: 24px;
width: 360px;
}
#control_event_node_edit_modal,
#control_event_edge_edit_modal,
#control_event_node_delete_modal,
#control_event_edge_delete_modal,
#control_event_new_node_modal {
width: 640px;
margin-left: -320px;
}

15
js/common/modules/org/arangodb/foxx/preprocessor.js
View File

@ -124,17 +124,24 @@ extend(Preprocessor.prototype, {
stripComment: function (str) {
'use strict';
return str.match(/^\s*\/?\*\*?\/?\s*(.*)$/)[1];
return str.replace(/^\s*\/\*\*/, ''). // start of JSDoc comment
replace(/^\s*\*/, ''). // continuation of JSDoc comment
replace(/^.*?\*\//, ''). // end of JSDoc comment
replace(/\\/g, '\\\\'). // replace backslashes
replace(/"/g, '\\"'); // replace quotes
},
isJSDoc: function (str) {
'use strict';
var matched;
if (this.inJSDoc && str.match(/^\s*\*/)) {
matched = true;
if (str.match(/^\s*\*\//)) {
if (this.inJSDoc) {
if (str.match(/\*\//)) {
this.inJSDoc = false;
matched = true;
}
else {
matched = true;
}
} else if ((!this.inJSDoc) && str.match(/^\s*\/\*\*/)) {
matched = true;