From 0db154bff415d7b78ae9296260cbf5572a97e797 Mon Sep 17 00:00:00 2001
From: Jeff Schiller
Date: Sun, 16 Jan 2011 23:07:35 +0000
Subject: [PATCH] Rename document module to draw. Add getNumLayers() to draw
module.
git-svn-id: http://svg-edit.googlecode.com/svn/trunk@1925 eee81c28-f429-11dd-99c0-75d572ba1ddd
---
Makefile | 2 +-
editor/{document.js => draw.js} | 56 ++++----
editor/embedapi.js | 2 +-
editor/svg-editor.html | 2 +-
editor/svg-editor.js | 10 +-
editor/svgcanvas.js | 136 +++++++++-----------
test/all_tests.html | 2 +-
test/{document_test.html => draw_test.html} | 41 +++---
8 files changed, 118 insertions(+), 133 deletions(-)
rename editor/{document.js => draw.js} (74%)
rename test/{document_test.html => draw_test.html} (79%)
diff --git a/Makefile b/Makefile
index c6eb9607..cd67f0b5 100644
--- a/Makefile
+++ b/Makefile
@@ -31,7 +31,7 @@ build/$(PACKAGE):
--js sanitize.js \
--js history.js \
--js select.js \
- --js document.js \
+ --js draw.js \
--js svgcanvas.js \
--js svg-editor.js \
--js locale/locale.js \
diff --git a/editor/document.js b/editor/draw.js
similarity index 74%
rename from editor/document.js
rename to editor/draw.js
index 4a52b4a2..fc97ccea 100644
--- a/editor/document.js
+++ b/editor/draw.js
@@ -1,24 +1,11 @@
/**
- * Package: svgedit.document
+ * Package: svgedit.draw
*
* Licensed under the Apache License, Version 2
*
- * Copyright(c) 2010 Jeff Schiller
+ * Copyright(c) 2011 Jeff Schiller
*/
-/*
- TODO: consider renaming this package to "draw" and the class to "Drawing"
-
- TODOs:
-
- Phase 1:
- - migrate usages of randomizeIds() to proxy into the Document
-
- Phase 2:
- - migrate uniquifyElems into this module
- - migrate as many usages of svgcontent in svgcanvas to using a Document instance as possible
-
- */
// Dependencies:
// 1) jQuery
@@ -27,34 +14,34 @@ if (!window.svgedit) {
window.svgedit = {};
}
-if (!svgedit.document) {
- svgedit.document = {};
+if (!svgedit.draw) {
+ svgedit.draw = {};
}
var svg_ns = "http://www.w3.org/2000/svg";
var se_ns = "http://svg-edit.googlecode.com";
/**
- * This class encapsulates the concept of a layer in the document.
+ * This class encapsulates the concept of a layer in the drawing
* @param name {String} Layer name
* @param child {SVGGElement} Layer SVG group.
*/
-svgedit.document.Layer = function(name, group) {
+svgedit.draw.Layer = function(name, group) {
this.name_ = name;
this.group_ = group;
};
-svgedit.document.Layer.prototype.getName = function() {
+svgedit.draw.Layer.prototype.getName = function() {
return this.name_;
};
-svgedit.document.Layer.prototype.getGroup = function() {
+svgedit.draw.Layer.prototype.getGroup = function() {
return this.group_;
};
/**
- * This class encapsulates the concept of a SVG-edit document.
+ * This class encapsulates the concept of a SVG-edit drawing
*
* @param svgElem {SVGSVGElement} The SVG DOM Element that this JS object
* encapsulates. If the svgElem has a se:nonce attribute on it, then
@@ -62,10 +49,10 @@ svgedit.document.Layer.prototype.getGroup = function() {
* @param opt_idPrefix {String} The ID prefix to use. Defaults to "svg_"
* if not specified.
*/
-svgedit.document.Document = function(svgElem, opt_idPrefix) {
+svgedit.draw.Drawing = function(svgElem, opt_idPrefix) {
if (!svgElem || !svgElem.tagName || !svgElem.namespaceURI ||
svgElem.tagName != 'svg' || svgElem.namespaceURI != svg_ns) {
- throw "Error: svgedit.document.Document instance initialized without a
-
+