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

public/svg-edit/editor/locale/lang.en.js

@@ -132,12 +132,13 @@
 {"id": "zoom_panel", "title": "Change zoom level"},
 {"id": "zoomLabel", "textContent": "zoom:"},
 {"id": "sidepanel_handle", "textContent": "L a y e r s", "title": "Drag left/right to resize side panel"},
+{"id": "main_icon", "title": "Main Menu"},
 {"id": "tool_blur", "title": "Change gaussian blur value"},
 {"id": "tool_position", "title": "Align Element to Page"},
 {"id": "idLabel", "title": "Identify the element"},
 {"id": "tool_openclose_path", "title": "Open/close sub-path"},
 {"id": "tool_add_subpath", "title": "Add sub-path"},
-{"id": "cur_linejoin", "title": "Add sub-path"},
+{"id": "toggle_stroke_tools", "title": "Show/hide more stroke tools"},
 {"id": "linejoin_miter", "title": "Linejoin: Miter"},
 {"id": "linejoin_round", "title": "Linejoin: Round"},
 {"id": "linejoin_bevel", "title": "Linejoin: Bevel"},
@@ -150,6 +151,8 @@
 {"id": "mode_connect", "title": "Connect two objects"},
 {"id": "connector_no_arrow", "textContent": "No arrow"},
 
+
+
 {
  "js_strings": {
   "QerrorsRevertToSource": "There were parsing errors in your SVG source.\nRevert back to original SVG source?", 

public/svg-edit/editor/svg-editor.html

@@ -452,7 +452,6 @@ script type="text/javascript" src="locale/locale.min.js"></script-->
 				</label>
 				
 				<label class="stroke_tool">
-					<span>Dash:</span>
 					<select id="stroke_style" title="Change stroke dash style">
 						<option selected="selected" value="none">&mdash;</option>
 						<option value="2,2">...</option>

public/svg-edit/editor/svg-editor.js

@@ -1115,7 +1115,7 @@
 					
 					var angle = svgCanvas.getRotationAngle(elem);
 					$('#angle').val(angle);
-
+					
 					var blurval = svgCanvas.getBlur(elem);
 					$('#blur').val(blurval);
 					$('#blur_slider').slider('option', 'value', blurval);
@@ -1354,10 +1354,16 @@
 			var changeBlur = function(ctl, val, noUndo) {
 				if(val == null) val = ctl.value;
 				$('#blur').val(val);
+				var complete = false;
 				if(!ctl || !ctl.handle) {
 					$('#blur_slider').slider('option', 'value', val);
+					complete = true;
+				}
+				if(noUndo) {
+					svgCanvas.setBlurNoUndo(val);	
+				} else {
+					svgCanvas.setBlur(val, complete);
 				}
-				svgCanvas.setBlur(val, noUndo);
 			}
 		
 			var operaRepaint = function() {
@@ -1752,16 +1758,22 @@
 			addDropDown('#blur_dropdown', function() {
 			});
 			
+			var slideStart = false;
+			
 			$("#blur_slider").slider({
 				max: 10,
 				step: .1,
 				stop: function(evt, ui) {
+					slideStart = false;
 					changeBlur(ui);
 					$('#blur_dropdown li').show();
 					$(window).mouseup();
 				},
+				start: function() {
+					slideStart = true;
+				},
 				slide: function(evt, ui){
-					changeBlur(ui, null, true);
+					changeBlur(ui, null, slideStart);
 				}
 			});
 
@@ -3440,7 +3452,7 @@
 				updateCanvas(true);
 // 			});
 			
-		//	var revnums = "svg-editor.js ($Rev: 1548 $) ";
+		//	var revnums = "svg-editor.js ($Rev: 1550 $) ";
 		//	revnums += svgCanvas.getVersion();
 		//	$('#copyright')[0].setAttribute("title", revnums);
 		
@@ -3528,15 +3540,19 @@
 					// Copy title for certain tool elements
 					var elems = {
 						'#stroke_color': '#tool_stroke .icon_label, #tool_stroke .color_block',
-// 						'#group_opacity': '#tool_opacity', // Change lang file
-//						'#zoom': '#zoom_panel',
-						'#fill_color': '#tool_fill label, #tool_fill .color_block'
+						'#fill_color': '#tool_fill label, #tool_fill .color_block',
+						'#linejoin_miter': '#cur_linejoin',
+						'#linecap_butt': '#cur_linecap'
 					}
 					
 					$.each(elems, function(source, dest) {
-						$(dest).attr('title', $(source).attr('title'));
+						$(dest).attr('title', $(source)[0].title);
+					});
+					
+					// Copy alignment titles
+					$('#multiselected_panel div[id^=tool_align]').each(function() {
+						$('#tool_pos' + this.id.substr(10))[0].title = this.title;
 					});
-
 					
 				}
 			};

public/svg-edit/editor/svgcanvas.js

@@ -1,4 +1,4 @@
-/*
+/*
  * svgcanvas.js
  *
  * Licensed under the Apache License, Version 2
@@ -1631,7 +1631,10 @@ function BatchCommand(text) {
 					
 					// Namespaces have already been dealt with, so skip
 					if(attr.nodeName.indexOf('xmlns:') === 0) continue;
-					
+
+					//remove bogus attributes added by Gecko
+					if (attr.localName == '-moz-math-font-style') continue;
+
 					// only serialize attributes we don't use internally
 					if (attrVal != "" && 
 						$.inArray(attr.localName, ['width','height','xmlns','x','y','viewBox','id','overflow']) == -1)