extensions now correctly referenced

Makefile

@@ -32,6 +32,10 @@ JS_FILES=\
   jquery-ui/jquery-ui-1.8.17.custom.min.js \
   jgraduate/jpicker.min.js \
   mousewheel.js \
+	extensions/ext-eyedropper.js \
+	extensions/ext-markers.js \
+	extensions/ext-grid.js \
+	extensions/ext-imagelib.js \
 
 CSS_FILES=\
   fonts.css \

editor/extensions/ext-eyedropper.js

@@ -25,7 +25,7 @@ svgEditor.addExtension("eyedropper", function(S) {
 							strokeWidth: 5, strokeDashArray: null,
 							opacity: 1.0,
 							strokeLinecap: 'butt',
-							strokeLinejoin: 'miter',
+							strokeLinejoin: 'miter'
 							};
 		function getStyle(opts) {
 			// if we are in eyedropper mode, we don't want to disable the eye-dropper tool
@@ -86,7 +86,7 @@ svgEditor.addExtension("eyedropper", function(S) {
 				type: "mode",
 				title: "Eye Dropper Tool",
 				key: "I",
-				class: "disabled",
+				"class": "disabled",
 				events: {
 					"click": function() {
 						svgCanvas.setMode("eyedropper");
@@ -140,6 +140,6 @@ svgEditor.addExtension("eyedropper", function(S) {
 						addToHistory(batchCmd);
 					}
 				}
-			},
+			}
 		};
 });

editor/extensions/ext-markers.js

@@ -69,7 +69,7 @@ svgEditor.addExtension("Markers", function(S) {
 		triangle:
 			{element:'path', attr:{d:'M10,80 L50,20 L80,80 Z'}},
 		mcircle:
-			{element:'circle', attr:{r:30, cx:50, cy:50}},			
+			{element:'circle', attr:{r:30, cx:50, cy:50}}
 	}
 	
 	
@@ -95,7 +95,7 @@ svgEditor.addExtension("Markers", function(S) {
 			{id: "box_o", title: "Open Box" },
 			{id: "star_o", title: "Open Star" },
 			{id: "triangle_o", title: "Open Triangle" },
-			{id: "mcircle_o", title: "Open Circle" },
+			{id: "mcircle_o", title: "Open Circle" }
 		]
 	};
 

method-draw/extensions/ext-eyedropper.js

@@ -25,7 +25,7 @@ svgEditor.addExtension("eyedropper", function(S) {
 							strokeWidth: 5, strokeDashArray: null,
 							opacity: 1.0,
 							strokeLinecap: 'butt',
-							strokeLinejoin: 'miter',
+							strokeLinejoin: 'miter'
 							};
 		function getStyle(opts) {
 			// if we are in eyedropper mode, we don't want to disable the eye-dropper tool
@@ -86,7 +86,7 @@ svgEditor.addExtension("eyedropper", function(S) {
 				type: "mode",
 				title: "Eye Dropper Tool",
 				key: "I",
-				class: "disabled",
+				"class": "disabled",
 				events: {
 					"click": function() {
 						svgCanvas.setMode("eyedropper");
@@ -140,6 +140,6 @@ svgEditor.addExtension("eyedropper", function(S) {
 						addToHistory(batchCmd);
 					}
 				}
-			},
+			}
 		};
 });

method-draw/extensions/ext-markers.js

@@ -69,7 +69,7 @@ svgEditor.addExtension("Markers", function(S) {
 		triangle:
 			{element:'path', attr:{d:'M10,80 L50,20 L80,80 Z'}},
 		mcircle:
-			{element:'circle', attr:{r:30, cx:50, cy:50}},			
+			{element:'circle', attr:{r:30, cx:50, cy:50}}
 	}
 	
 	
@@ -95,7 +95,7 @@ svgEditor.addExtension("Markers", function(S) {
 			{id: "box_o", title: "Open Box" },
 			{id: "star_o", title: "Open Star" },
 			{id: "triangle_o", title: "Open Triangle" },
-			{id: "mcircle_o", title: "Open Circle" },
+			{id: "mcircle_o", title: "Open Circle" }
 		]
 	};
 

method-draw/index.html

@@ -39,6 +39,7 @@
   <script type="text/javascript" src="sanitize.js"></script>
   <script type="text/javascript" src="history.js"></script>
   <script type="text/javascript" src="select.js"></script>
+  <script type="text/javascript" src="hover.js"></script>
   <script type="text/javascript" src="draw.js"></script>
   <script type="text/javascript" src="path.js"></script>
   <script type="text/javascript" src="svgcanvas.js"></script>
@@ -48,6 +49,8 @@
   <script type="text/javascript" src="jquery-ui/jquery-ui-1.8.17.custom.min.js"></script>
   <script type="text/javascript" src="jgraduate/jpicker.min.js"></script>
   <script type="text/javascript" src="mousewheel.js"></script>
+  <script type="text/javascript" src="extensions/ext-eyedropper.js"></script>
+  <script type="text/javascript" src="extensions/ext-grid.js"></script>
 <!{endif}-->
 
 <!-- you can load extensions here -->
@@ -87,7 +90,6 @@ $(function(){
 </div>
 
 <div id="workarea">
-<style id="styleoverrides" type="text/css" media="screen" scoped="scoped"></style>
 <div id="svgcanvas" style="position:relative">
 
 </div>
@@ -182,6 +184,7 @@ $(function(){
   	<div class="menu_list" id="view_menu">
   	    <div class="menu_item push_button_pressed" id="tool_rulers">View Rulers</div>
   	    <div class="menu_item" id="tool_wireframe">View Wireframe</div>
+  	    <div class="menu_item" id="tool_snap">Snap to Grid</div>
   	    <div class="separator"></div>
     		<div class="menu_item" id="tool_source">Source... <span class="shortcut">⌘U</span></div>
     </div>
@@ -787,8 +790,17 @@ $(function(){
 				<label>
 				  <div class="subtitle"><strong>Units &amp; Rulers</strong></div>
 				  <span id="svginfo_rulers_onoff"><input type="checkbox" value="show_rulers" id="show_rulers" checked> Show rulers</span>  
+				</label>
 	
-					<span id="svginfo_unit">Base Unit:</span>
+		</fieldset>
+		<div>
+		  <button id="tool_prefs_cancel" class="cancel">Cancel</button>
+			<button id="tool_prefs_save">Save</button>
+		</div>
+	</div>
+</div>
+
+<div id="base_unit_container">
   <select id="base_unit">
   	<option value="px">Pixels</option>
   	<option value="cm">Centimeters</option>
@@ -799,14 +811,6 @@ $(function(){
   	<option value="em">Ems</option>
   	<option value="ex">Exs</option>
   </select>
-				</label>
-	
-		</fieldset>
-		<div>
-		  <button id="tool_prefs_cancel" class="cancel">Cancel</button>
-			<button id="tool_prefs_save">Save</button>
-		</div>
-	</div>
 </div>
 
 <div id="dialog_box">