From 137bc169b4e1bcdcbb37e9beec3e2d9b7d9da85f Mon Sep 17 00:00:00 2001 From: wout Date: Mon, 17 Dec 2012 12:19:37 +0100 Subject: [PATCH] Removed redundant code --- src/dispatcher.js | 17 ----------------- src/draggable.js | 46 ---------------------------------------------- src/image.js | 1 - src/nested.js | 12 ------------ src/shape.js | 1 - 5 files changed, 77 deletions(-) delete mode 100644 src/dispatcher.js delete mode 100644 src/draggable.js delete mode 100644 src/nested.js diff --git a/src/dispatcher.js b/src/dispatcher.js deleted file mode 100644 index 2765652..0000000 --- a/src/dispatcher.js +++ /dev/null @@ -1,17 +0,0 @@ -SVG.Dispatcher = { - - on: function(events, listener) { - events = events.split(' '); - - for (var i = 0, l = events.length; i < l; i++) - this.svgElement.addEventListener(events[i], listener) - }, - - off: function(events, listener) { - events = events.split(' '); - - for (var i = 0, l = events.length; i < l; i++) - this.svgElement.removeEventListener(events[i], listener) - } - -}; \ No newline at end of file diff --git a/src/draggable.js b/src/draggable.js deleted file mode 100644 index b0deac7..0000000 --- a/src/draggable.js +++ /dev/null @@ -1,46 +0,0 @@ - -var bind = function(fn, me) { - return function() { return fn.apply(me, arguments); }; -}; - -SVG.Draggable = function Draggable(e) { - this._windowMouseUp = bind(this._windowMouseUp, this); - this._windowMouseMove = bind(this._windowMouseMove, this); - this.draggable = bind(this.draggable, this); - this.element = e; - this.element.draggable = this.draggable; -}; - -SVG.Draggable.prototype.draggable = function() { - var self = this; - this.element.on('mousedown', function(e) { - self.startDragEvent = e; - self.startDragPosition = { - x: self.element.attributes.x || 0, - y: self.element.attributes.y || 0 - }; - window.addEventListener('mousemove', self._windowMouseMove); - window.addEventListener('mouseup', self._windowMouseUp); - return typeof self.element.dragstart === 'function' ? self.element.dragstart(e) : void 0; - }); - return this.element; -}; - -SVG.Draggable.prototype._windowMouseMove = function(e) { - if (this.startDragEvent != null) { - var d = { - x: e.pageX - this.startDragEvent.pageX, - y: e.pageY - this.startDragEvent.pageY - }; - this.element.move(this.startDragPosition.x + d.x, this.startDragPosition.y + d.y); - return typeof this.element.dragmove === 'function' ? this.element.dragmove(d, e) : void 0; - } -}; - -SVG.Draggable.prototype._windowMouseUp = function(e) { - this.startDragEvent = null; - this.startDragPosition = null; - window.removeEventListener('mousemove', this._windowMouseMove); - window.removeEventListener('mouseup', this._windowMouseUp); - return typeof this.element.dragend === 'function' ? this.element.dragend(e) : void 0; -}; \ No newline at end of file diff --git a/src/image.js b/src/image.js index ff70aee..3c60f2a 100644 --- a/src/image.js +++ b/src/image.js @@ -1,6 +1,5 @@ SVG.Image = function Image() { - this.drag = new SVG.Draggable(this); this.constructor.call(this, SVG.createElement('image')); }; diff --git a/src/nested.js b/src/nested.js deleted file mode 100644 index 6245ca6..0000000 --- a/src/nested.js +++ /dev/null @@ -1,12 +0,0 @@ - -SVG.Nested = function Nested() { - this.drag = new SVG.Draggable(this); - this.constructor.call(this, SVG.createElement('svg')); - this.setAttribute('overflow', 'visible'); -}; - -// inherit from SVG.Element -SVG.Nested.prototype = new SVG.Element(); - -// include the container object -SVG.Nested.include(SVG.Container); \ No newline at end of file diff --git a/src/shape.js b/src/shape.js index 8295f1c..236b33e 100644 --- a/src/shape.js +++ b/src/shape.js @@ -1,6 +1,5 @@ SVG.Shape = function Shape(element) { - this.drag = new SVG.Draggable(this); this.constructor.call(this, element); }; -- 2.39.5