deac/instiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki

Browse source
This commit is contained in:
Jacques Distler 2010-09-13 17:06:53 -05:00
parent 04bb80be15 d80003d502
commit a099648554
3 changed files with 20 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
public/svg-edit/editor/extensions/ext-connector.js
View file

@ -27,6 +27,8 @@ svgEditor.addExtension("Connector", function(S) {
// connect_str = "-SE_CONNECT-", // connect_str = "-SE_CONNECT-",
selElems = []; selElems = [];
elData = $.data;
var lang_list = { var lang_list = {
"en":[ "en":[
{"id": "mode_connect", "title": "Connect two objects" } {"id": "mode_connect", "title": "Connect two objects" }
@ -94,15 +96,15 @@ svgEditor.addExtension("Connector", function(S) {
// var sw = line.getAttribute('stroke-width') * 5; // var sw = line.getAttribute('stroke-width') * 5;
// Update bbox for this element // Update bbox for this element
var bb = $(line).data(pre+'_bb'); var bb = elData(line, pre+'_bb');
bb.x = conn.start_x + diff_x; bb.x = conn.start_x + diff_x;
bb.y = conn.start_y + diff_y; bb.y = conn.start_y + diff_y;
$(line).data(pre+'_bb', bb); elData(line, pre+'_bb', bb);
var alt_pre = conn.is_start?'end':'start'; var alt_pre = conn.is_start?'end':'start';
// Get center pt of connected element // Get center pt of connected element
var bb2 = $(line).data(alt_pre+'_bb'); var bb2 = elData(line, alt_pre+'_bb');
var src_x = bb2.x + bb2.width/2; var src_x = bb2.x + bb2.width/2;
var src_y = bb2.y + bb2.height/2; var src_y = bb2.y + bb2.height/2;
@ -111,7 +113,7 @@ svgEditor.addExtension("Connector", function(S) {
setPoint(line, conn.is_start?0:'end', pt.x, pt.y, true); setPoint(line, conn.is_start?0:'end', pt.x, pt.y, true);
// Set point of connected element // Set point of connected element
var pt2 = getBBintersect(pt.x, pt.y, $(line).data(alt_pre + '_bb'), getOffset(alt_pre, line)); var pt2 = getBBintersect(pt.x, pt.y, elData(line, alt_pre + '_bb'), getOffset(alt_pre, line));
setPoint(line, conn.is_start?'end':0, pt2.x, pt2.y, true); setPoint(line, conn.is_start?'end':0, pt2.x, pt2.y, true);
} }
@ -124,8 +126,8 @@ svgEditor.addExtension("Connector", function(S) {
// Loop through connectors to see if one is connected to the element // Loop through connectors to see if one is connected to the element
connectors.each(function() { connectors.each(function() {
var start = $(this).data("c_start"); var start = elData(this, "c_start");
var end = $(this).data("c_end"); var end = elData(this, "c_end");
var parts = [getElem(start), getElem(end)]; var parts = [getElem(start), getElem(end)];
for(var i=0; i<2; i++) { for(var i=0; i<2; i++) {
@ -177,13 +179,13 @@ svgEditor.addExtension("Connector", function(S) {
var bb = svgCanvas.getStrokedBBox([elem]); var bb = svgCanvas.getStrokedBBox([elem]);
bb.x = conn.start_x; bb.x = conn.start_x;
bb.y = conn.start_y; bb.y = conn.start_y;
$(line).data(pre+'_bb', bb); elData(line, pre+'_bb', bb);
var add_offset = $(line).data(pre+'_off'); var add_offset = elData(line, pre+'_off');
var alt_pre = conn.is_start?'end':'start'; var alt_pre = conn.is_start?'end':'start';
// Get center pt of connected element // Get center pt of connected element
var bb2 = $(line).data(alt_pre+'_bb'); var bb2 = elData(line, alt_pre+'_bb');
var src_x = bb2.x + bb2.width/2; var src_x = bb2.x + bb2.width/2;
var src_y = bb2.y + bb2.height/2; var src_y = bb2.y + bb2.height/2;
@ -192,7 +194,7 @@ svgEditor.addExtension("Connector", function(S) {
setPoint(line, conn.is_start?0:'end', pt.x, pt.y, true); setPoint(line, conn.is_start?0:'end', pt.x, pt.y, true);
// Set point of connected element // Set point of connected element
var pt2 = getBBintersect(pt.x, pt.y, $(line).data(alt_pre + '_bb'), getOffset(alt_pre, line)); var pt2 = getBBintersect(pt.x, pt.y, elData(line, alt_pre + '_bb'), getOffset(alt_pre, line));
setPoint(line, conn.is_start?'end':0, pt2.x, pt2.y, true); setPoint(line, conn.is_start?'end':0, pt2.x, pt2.y, true);
// Update points attribute manually for webkit // Update points attribute manually for webkit
@ -359,7 +361,7 @@ svgEditor.addExtension("Connector", function(S) {
"style": "pointer-events:none" "style": "pointer-events:none"
} }
}); });
$(cur_line).data('start_bb', bb); elData(cur_line, 'start_bb', bb);
} }
return { return {
started: true started: true
@ -383,7 +385,7 @@ svgEditor.addExtension("Connector", function(S) {
var sw = cur_line.getAttribute('stroke-width') * 3; var sw = cur_line.getAttribute('stroke-width') * 3;
// Set start point (adjusts based on bb) // Set start point (adjusts based on bb)
var pt = getBBintersect(x, y, $(cur_line).data('start_bb'), getOffset('start', cur_line)); var pt = getBBintersect(x, y, elData(cur_line, 'start_bb'), getOffset('start', cur_line));
start_x = pt.x; start_x = pt.x;
start_y = pt.y; start_y = pt.y;
@ -397,7 +399,7 @@ svgEditor.addExtension("Connector", function(S) {
while(slen--) { while(slen--) {
var elem = selElems[slen]; var elem = selElems[slen];
// Look for selected connector elements // Look for selected connector elements
if(elem && $(elem).data('c_start')) { if(elem && elData(elem, 'c_start')) {
// Remove the "translate" transform given to move // Remove the "translate" transform given to move
svgCanvas.removeFromSelection([elem]); svgCanvas.removeFromSelection([elem]);
svgCanvas.getTransformList(elem).clear(); svgCanvas.getTransformList(elem).clear();
@ -501,7 +503,7 @@ svgEditor.addExtension("Connector", function(S) {
while(i--) { while(i--) {
var elem = selElems[i]; var elem = selElems[i];
if(elem && $(elem).data('c_start')) { if(elem && elData(elem, 'c_start')) {
selManager.requestSelector(elem).showGrips(false); selManager.requestSelector(elem).showGrips(false);
if(opts.selectedElement && !opts.multiselected) { if(opts.selectedElement && !opts.multiselected) {
// TODO: Set up context tools and hide most regular line tools // TODO: Set up context tools and hide most regular line tools
@ -567,7 +569,7 @@ svgEditor.addExtension("Connector", function(S) {
} }
// Update line if it's a connector // Update line if it's a connector
if(elem.getAttribute('class') == conn_sel.substr(1)) { if(elem.getAttribute('class') == conn_sel.substr(1)) {
var start = getElem($(elem).data('c_start')); var start = getElem(elData(elem, 'c_start'));
updateConnectors([start]); updateConnectors([start]);
} else { } else {
updateConnectors(); updateConnectors();

3
public/svg-edit/editor/svgcanvas.js
View file

@ -1370,6 +1370,7 @@ var SelectorManager;
mgr.selectorParentGroup = svgdoc.createElementNS(svgns, "g"); mgr.selectorParentGroup = svgdoc.createElementNS(svgns, "g");
mgr.selectorParentGroup.setAttribute("id", "selectorParentGroup"); mgr.selectorParentGroup.setAttribute("id", "selectorParentGroup");
mgr.selectorGripsGroup = svgdoc.createElementNS(svgns, "g"); mgr.selectorGripsGroup = svgdoc.createElementNS(svgns, "g");
mgr.selectorGripsGroup.setAttribute('display','none');
svgroot.appendChild(mgr.selectorParentGroup); svgroot.appendChild(mgr.selectorParentGroup);
mgr.selectorParentGroup.appendChild(mgr.selectorGripsGroup); mgr.selectorParentGroup.appendChild(mgr.selectorGripsGroup);
mgr.selectorMap = {}; mgr.selectorMap = {};
@ -9014,7 +9015,7 @@ this.getZoom = function(){return current_zoom;};
// Function: getVersion // Function: getVersion
// Returns a string which describes the revision number of SvgCanvas. // Returns a string which describes the revision number of SvgCanvas.
this.getVersion = function() { this.getVersion = function() {
return "svgcanvas.js ($Rev: 1712 $)"; return "svgcanvas.js ($Rev: 1714 $)";
}; };
// Function: setUiStrings // Function: setUiStrings

2
public/svg-edit/editor/svgicons/jquery.svgicons.js
View file

@ -500,7 +500,7 @@ $(function() {
$.getSvgIcon = function(id, uniqueClone) { $.getSvgIcon = function(id, uniqueClone) {
var icon = svg_icons[id]; var icon = svg_icons[id];
if(uniqueClone) { if(uniqueClone && icon) {
icon = fixIDs(icon, 0, true).clone(true); icon = fixIDs(icon, 0, true).clone(true);
} }
return icon; return icon;