mirror of
https://bitbucket.org/wisemapping/wisemapping-open-source.git
synced 2024-09-12 07:10:07 +02:00
Merge branch 'master' of ssh://wisemapping.com/var/git-repos/wise-source
This commit is contained in:
commit
3435bd17c2
1
core-js/pepe.txy
Normal file
1
core-js/pepe.txy
Normal file
@ -0,0 +1 @@
|
|||||||
|
s
|
@ -17,7 +17,7 @@ mvn clean
|
|||||||
|
|
||||||
# Prepare copy
|
# Prepare copy
|
||||||
mkdir -p ${TMP_DIR}
|
mkdir -p ${TMP_DIR}
|
||||||
rsync -aCv --exclude ".git" --exclude "wisemapping.i*" --exclude "*/*.iml" --exclude "*/wisemapping.log*" --exclude "**/.DS_Store" --exclude "*.textile" --exclude "**/.gitignore" --exclude "installer" --exclude "*/target" . ${TMP_DIR}
|
rsync -aCv --exclude ".git" --exclude "wisemapping.i*" --exclude "**/*/Brix*" --exclude "**/brix" --exclude "*/*.iml" --exclude "*/wisemapping.log*" --exclude "**/.DS_Store" --exclude "*.textile" --exclude "**/.gitignore" --exclude "installer" --exclude "*/target" . ${TMP_DIR}
|
||||||
|
|
||||||
# Zip file
|
# Zip file
|
||||||
[ ! -e ${OUTPUT_DIR} ] && mkdir ${OUTPUT_DIR}
|
[ ! -e ${OUTPUT_DIR} ] && mkdir ${OUTPUT_DIR}
|
||||||
|
@ -68,7 +68,6 @@
|
|||||||
<filelist dir="${basedir}/src/main/javascript/" files="model/NodeModel.js"/>
|
<filelist dir="${basedir}/src/main/javascript/" files="model/NodeModel.js"/>
|
||||||
<filelist dir="${basedir}/src/main/javascript/" files="model/RelationshipModel.js"/>
|
<filelist dir="${basedir}/src/main/javascript/" files="model/RelationshipModel.js"/>
|
||||||
<filelist dir="${basedir}/src/main/javascript/" files="ActionDispatcher.js"/>
|
<filelist dir="${basedir}/src/main/javascript/" files="ActionDispatcher.js"/>
|
||||||
<filelist dir="${basedir}/src/main/javascript/" files="BrixActionDispatcher.js"/>
|
|
||||||
<filelist dir="${basedir}/src/main/javascript/"
|
<filelist dir="${basedir}/src/main/javascript/"
|
||||||
files="StandaloneActionDispatcher.js"/>
|
files="StandaloneActionDispatcher.js"/>
|
||||||
<filelist dir="${basedir}/src/main/javascript/" files="DesignerModel.js"/>
|
<filelist dir="${basedir}/src/main/javascript/" files="DesignerModel.js"/>
|
||||||
@ -190,14 +189,6 @@
|
|||||||
files="collaboration/framework/AbstractCollaborativeFramework.js"/>
|
files="collaboration/framework/AbstractCollaborativeFramework.js"/>
|
||||||
<filelist dir="${basedir}/src/main/javascript/"
|
<filelist dir="${basedir}/src/main/javascript/"
|
||||||
files="collaboration/framework/AbstractCollaborativeModelFactory.js"/>
|
files="collaboration/framework/AbstractCollaborativeModelFactory.js"/>
|
||||||
<filelist dir="${basedir}/src/main/javascript/"
|
|
||||||
files="collaboration/framework/brix/model/NodeModel.js"/>
|
|
||||||
<filelist dir="${basedir}/src/main/javascript/"
|
|
||||||
files="collaboration/framework/brix/model/Mindmap.js"/>
|
|
||||||
<filelist dir="${basedir}/src/main/javascript/"
|
|
||||||
files="collaboration/framework/brix/BrixCollaborativeModelFactory.js"/>
|
|
||||||
<filelist dir="${basedir}/src/main/javascript/"
|
|
||||||
files="collaboration/framework/brix/BrixFramework.js"/>
|
|
||||||
<filelist dir="${basedir}/src/main/javascript/widget/" files="ToolbarNotifier.js"/>
|
<filelist dir="${basedir}/src/main/javascript/widget/" files="ToolbarNotifier.js"/>
|
||||||
<filelist dir="${basedir}/src/main/javascript/widget/" files="ToolbarItem.js"/>
|
<filelist dir="${basedir}/src/main/javascript/widget/" files="ToolbarItem.js"/>
|
||||||
<filelist dir="${basedir}/src/main/javascript/widget/" files="ToolbarPaneItem.js"/>
|
<filelist dir="${basedir}/src/main/javascript/widget/" files="ToolbarPaneItem.js"/>
|
||||||
|
@ -90,7 +90,7 @@ mindplot.BubbleTip = new Class({
|
|||||||
}.bind(this)}).start(0, 100);
|
}.bind(this)}).start(0, 100);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
updatePosition : function(event) {
|
updateBranchPosition : function(event) {
|
||||||
this._evt = new Event(event);
|
this._evt = new Event(event);
|
||||||
},
|
},
|
||||||
close : function(event) {
|
close : function(event) {
|
||||||
|
@ -103,6 +103,7 @@ mindplot.layout.BaseLayoutManager = new Class({
|
|||||||
var type = node.getModel().getType();
|
var type = node.getModel().getType();
|
||||||
return type == mindplot.model.INodeModel.CENTRAL_TOPIC_TYPE;
|
return type == mindplot.model.INodeModel.CENTRAL_TOPIC_TYPE;
|
||||||
},
|
},
|
||||||
|
|
||||||
getClassName:function() {
|
getClassName:function() {
|
||||||
return mindplot.layout.BaseLayoutManager.NAME;
|
return mindplot.layout.BaseLayoutManager.NAME;
|
||||||
}
|
}
|
||||||
|
@ -31,7 +31,7 @@ mindplot.nlayout.OriginalLayout = new Class({
|
|||||||
|
|
||||||
disconnectNode: function(nodeId) {
|
disconnectNode: function(nodeId) {
|
||||||
var node = this._treeSet.find(nodeId);
|
var node = this._treeSet.find(nodeId);
|
||||||
$assert(this._treeSet.getParent(node),"Node already disconnected");
|
$assert(this._treeSet.getParent(node), "Node already disconnected");
|
||||||
|
|
||||||
// Remove from children list.
|
// Remove from children list.
|
||||||
var sorter = node.getSorter();
|
var sorter = node.getSorter();
|
||||||
@ -42,7 +42,6 @@ mindplot.nlayout.OriginalLayout = new Class({
|
|||||||
|
|
||||||
// Fire a basic validation ...
|
// Fire a basic validation ...
|
||||||
sorter.verify(this._treeSet, node);
|
sorter.verify(this._treeSet, node);
|
||||||
|
|
||||||
},
|
},
|
||||||
|
|
||||||
layout: function() {
|
layout: function() {
|
||||||
@ -79,7 +78,12 @@ mindplot.nlayout.OriginalLayout = new Class({
|
|||||||
|
|
||||||
children.forEach(function(child) {
|
children.forEach(function(child) {
|
||||||
var offset = offsetById[child.getId()];
|
var offset = offsetById[child.getId()];
|
||||||
var newPos = {x:parentPosition.x + offset.x,y:parentPosition.y + offset.y};
|
var parentX = parentPosition.x;
|
||||||
|
var parentY = parentPosition.y;
|
||||||
|
|
||||||
|
var verticalOffset = (node.getSize().height / 2);
|
||||||
|
|
||||||
|
var newPos = {x:parentX + offset.x,y:parentY + offset.y + verticalOffset};
|
||||||
this._treeSet.updateBranchPosition(child, newPos);
|
this._treeSet.updateBranchPosition(child, newPos);
|
||||||
}.bind(this));
|
}.bind(this));
|
||||||
|
|
||||||
|
@ -10,7 +10,6 @@ mindplot.nlayout.SymetricSorder = new Class({
|
|||||||
return result;
|
return result;
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
||||||
_computeChildrenHeight : function(treeSet, node, heightCache) {
|
_computeChildrenHeight : function(treeSet, node, heightCache) {
|
||||||
var height = node.getSize().height + (mindplot.nlayout.SymetricSorder.INTERNODE_VERTICAL_PADDING * 2); // 2* Top and down padding;
|
var height = node.getSize().height + (mindplot.nlayout.SymetricSorder.INTERNODE_VERTICAL_PADDING * 2); // 2* Top and down padding;
|
||||||
|
|
||||||
@ -39,13 +38,13 @@ mindplot.nlayout.SymetricSorder = new Class({
|
|||||||
// No children...
|
// No children...
|
||||||
var children = graph.getChildren(parent);
|
var children = graph.getChildren(parent);
|
||||||
if (children.length == 0) {
|
if (children.length == 0) {
|
||||||
return [0,parent.getPosition()];
|
return [0,parent.getPosition()]; // @Todo:Change x ...
|
||||||
}
|
}
|
||||||
|
|
||||||
// Try to fit within ...
|
// Try to fit within ...
|
||||||
//
|
//
|
||||||
// - Order is change if the position top position is changed ...
|
// - Order is change if the position top position is changed ...
|
||||||
// - Suggested position is the middle bitween the two topics...
|
// - Suggested position is the middle between the two topics...
|
||||||
//
|
//
|
||||||
var result = null;
|
var result = null;
|
||||||
children.forEach(function(child) {
|
children.forEach(function(child) {
|
||||||
@ -67,6 +66,7 @@ mindplot.nlayout.SymetricSorder = new Class({
|
|||||||
insert: function(treeSet, parent, child, order) {
|
insert: function(treeSet, parent, child, order) {
|
||||||
var children = this._getSortedChildren(treeSet, parent);
|
var children = this._getSortedChildren(treeSet, parent);
|
||||||
$assert(order <= children.length, "Order must be continues and can not have holes. Order:" + order);
|
$assert(order <= children.length, "Order must be continues and can not have holes. Order:" + order);
|
||||||
|
$assert(order <= children.length, "Order must be continues and can not have holes. Order:" + order);
|
||||||
|
|
||||||
// Shift all the elements in one .
|
// Shift all the elements in one .
|
||||||
for (var i = order; i < children.length; i++) {
|
for (var i = order; i < children.length; i++) {
|
||||||
@ -117,7 +117,7 @@ mindplot.nlayout.SymetricSorder = new Class({
|
|||||||
// Compute heights ...
|
// Compute heights ...
|
||||||
var heights = children.map(function(child) {
|
var heights = children.map(function(child) {
|
||||||
return {id:child.getId(),height:this._computeChildrenHeight(treeSet, child)};
|
return {id:child.getId(),height:this._computeChildrenHeight(treeSet, child)};
|
||||||
}.bind(this));
|
}, this);
|
||||||
|
|
||||||
|
|
||||||
// Compute the center of the branch ...
|
// Compute the center of the branch ...
|
||||||
|
Loading…
Reference in New Issue
Block a user