Revert "Merge pull request #828 from svgdotjs/797-throw-error-in-at"

This reverts commit 55874e6dd16cb85181e879b8c35b4e65bb310e11, reversing
changes made to 31e94c28d85f676a0f4ec073a06435bc86b1dc73.

diff --git a/spec/spec/array.js b/spec/spec/array.js
index 03046caa0dfab7b266400f2db70b1d28c5ff342d..7530ea16dfbdc962a48fc18a9fe2d109c01b44ec 100644 (file)
--- a/spec/spec/array.js
+++ b/spec/spec/array.js
@@ -113,8 +113,8 @@ describe('Array', function () {
       arr1.morph(arr2)
       expect(arr1.at(0.5).value).toEqual([1.5, 2.5, 3.5, 4.5])
     })
-    it('throws when no destination was specified', function() {
-      expect(arr1.at).toThrow()
+    it('returns itself if no destination was specified', function() {
+      expect(arr1.at(0.5)).toBe(arr1)
     })
   })
 })
@@ -221,8 +221,8 @@ describe('PointArray', function () {
       arr1.morph(arr2)
       expect(arr1.at(0.5).value).toEqual([[1.5, 2.5], [3.5, 4.5]])
     })
-    it('throws when no destination was specified', function() {
-      expect(arr1.at).toThrow()
+    it('returns itself if no destination was specified', function() {
+      expect(arr1.at(0.5)).toBe(arr1)
     })
   })
 })
@@ -394,9 +394,10 @@ describe('PathArray', function () {
       expect(morphedPathArray.value[1][4]).toBe(1)
       expect(morphedPathArray.value[1][5]).toBe(0)
     })
-    it('throws when no destination was specified', function(){
+    it('return itself if the destination attribute is null', function(){
       var pathArray = new SVG.PathArray('M  13 13 A 25 37 0 0 1  43 25')
-      expect(pathArray.at).toThrow()
+      pathArray.destination = null
+      expect(pathArray.at(0.45)).toBe(pathArray)
     })
   })
 

diff --git a/spec/spec/boxes.js b/spec/spec/boxes.js
index cc428e4a5e8a574f498939b0f1a7d451e0a35b31..9e33c60171bf018193bb98c50c32dfe9e7e71164 100644 (file)
--- a/spec/spec/boxes.js
+++ b/spec/spec/boxes.js
@@ -148,9 +148,9 @@ describe('Box', function() {
       expect(box2.toString()).toBe('50 -100 300 300')
       expect(box3.toString()).toBe('30 0 250 300')
     })
-    it('throws itself when no destination was specified', function() {
+    it('returns itself when no destination given', function() {
       var box = new SVG.Box(10, 100, 200, 300)
-      expect(box.at).toThrow()
+      expect(box.at(0.5)).toBe(box)
     })
   })
 })

diff --git a/spec/spec/color.js b/spec/spec/color.js
index b70af1bf311d7fd9ac85d982e3c9a981f9afc1a1..1e8654463a928183341db17cbba752b96703d7aa 100644 (file)
--- a/spec/spec/color.js
+++ b/spec/spec/color.js
@@ -77,8 +77,8 @@ describe('Color', function() {
                        expect(morphed.b).toBe(255)
                })
     
-    it('throws when no destination specified', function() {
-      expect(color.at).toThrow()
+    it('returns itself when no destination specified', function() {
+      expect(color.at(0.5)).toBe(color)
     })
        })
 

diff --git a/spec/spec/matrix.js b/spec/spec/matrix.js
index aaebd68e38544fe9cc0106ceabda15233b094325..0816f6637ab7bf638b3892f115d741a0265b0dd4 100644 (file)
--- a/spec/spec/matrix.js
+++ b/spec/spec/matrix.js
@@ -193,9 +193,9 @@ describe('Matrix', function() {
       expect(matrix2.toString()).toBe('matrix(1,0,0,1,4,3)')
       expect(matrix3.toString()).toBe('matrix(1.5,0,0,3,2,1.5)')
     })
-    it('throws when no destination specified', function() {
+    it('returns itself when no destination specified', function() {
       var matrix = new SVG.Matrix(2, 0, 0, 5, 0, 0)
-      expect(matrix.at).toThrow()
+      expect(matrix.at(0.5)).toBe(matrix)
     })
   })
 

diff --git a/spec/spec/number.js b/spec/spec/number.js
index 2d33fef7e77f8df11a201d99fb0c5316231795d8..58c14bd701f20174169b414824c983299f3b0aa5 100644 (file)
--- a/spec/spec/number.js
+++ b/spec/spec/number.js
@@ -237,8 +237,8 @@ describe('Number', function() {
     it('use the unit of this number as the unit of the returned number when the destination number as no unit', function() {
       expect(expect(new SVG.Number('100s').morph(50).at(0.5).unit).toBe('s'))
     })
-    it('throws when no destination specified', function() {
-      expect(number.at).toThrow()
+    it('returns itself when no destination specified', function() {
+      expect(number.at(0.5)).toBe(number)
     })
   })
 

diff --git a/spec/spec/point.js b/spec/spec/point.js
index 80cc41421b0803570cc7bf1fcfafed3f48c8a951..8eacb8452e9455f98dbfdcb39ec85b62a167c8cd 100644 (file)
--- a/spec/spec/point.js
+++ b/spec/spec/point.js
@@ -117,9 +117,9 @@ describe('Point', function() {
 
       expect(point3).toEqual(new SVG.Point(1.5, 1.5))
     })
-    it('throws when no destination specified', function() {
+    it('returns itself when no destination specified', function() {
       var point = new SVG.Point(1,1)
-      expect(point.at).toThrow()
+      expect(point.at(0.4)).toBe(point)
     })
   })
 

diff --git a/src/array.js b/src/array.js
index 5ce01607207501cbc301590f8db2da686d770eee..ca51d8e2c19b7322cfe59919844d710dcaf301af 100644 (file)
--- a/src/array.js
+++ b/src/array.js
@@ -49,7 +49,7 @@ SVG.extend(SVG.Array, {
   // Get morphed array at given position
   at: function (pos) {
     // make sure a destination is defined
-    if (!this.destination) throw new Error('No destination set')
+    if (!this.destination) return this
 
     // generate morphed array
     for (var i = 0, il = this.value.length, array = []; i < il; i++) {

diff --git a/src/boxes.js b/src/boxes.js
index de96081e01a9c9a1899537e2cb0cac2c3d7ebd46..f0154bd55a8a5d04b9b65d38ca4e3e8af678da4c 100644 (file)
--- a/src/boxes.js
+++ b/src/boxes.js
@@ -74,7 +74,7 @@ SVG.Box = SVG.invent({
     },
 
     at: function (pos) {
-      if (!this.destination) throw new Error('No destination set')
+      if (!this.destination) return this
 
       return new SVG.Box(
           this.x + (this.destination.x - this.x) * pos

diff --git a/src/color.js b/src/color.js
index 22b85063a2d7cca18e4194c8750ebaa7997d049c..8f47f7015721417626bb159cebd9f365eeed6606 100644 (file)
--- a/src/color.js
+++ b/src/color.js
@@ -68,7 +68,7 @@ SVG.extend(SVG.Color, {
   // Get morphed color at given position
   at: function (pos) {
     // make sure a destination is defined
-    if (!this.destination) throw new Error('No destination set')
+    if (!this.destination) return this
 
     // normalise pos
     pos = pos < 0 ? 0 : pos > 1 ? 1 : pos

diff --git a/src/matrix.js b/src/matrix.js
index 8028b15761bc18778ea0b4f6b1928cfdd9c59bcc..e823a8100af739aaac1499235df9567ef66bc315 100644 (file)
--- a/src/matrix.js
+++ b/src/matrix.js
@@ -68,7 +68,7 @@ SVG.Matrix = SVG.invent({
     // Get morphed matrix at a given position
     at: function (pos) {
       // make sure a destination is defined
-      if (!this.destination) throw new Error('No destination set')
+      if (!this.destination) return this
 
       // calculate morphed matrix at a given position
       var matrix = new SVG.Matrix({

diff --git a/src/number.js b/src/number.js
index ba95151e57209bd2881dc284a5acbc31253db6e0..6413f9470ae330d5b659a02b8d990942c4c36974 100644 (file)
--- a/src/number.js
+++ b/src/number.js
@@ -91,7 +91,7 @@ SVG.Number = SVG.invent({
     // Get morphed number at given position
     at: function (pos) {
       // Make sure a destination is defined
-      if (!this.destination) throw new Error('No destination set')
+      if (!this.destination) return this
 
       // Generate new morphed number
       return new SVG.Number(this.destination)

diff --git a/src/patharray.js b/src/patharray.js
index ca585137600919d18b9b569d3cf8a279b7cab38d..d9ffecdc6e8629def031d78095fdba8c6ce6f2a5 100644 (file)
--- a/src/patharray.js
+++ b/src/patharray.js
@@ -195,7 +195,7 @@ SVG.extend(SVG.PathArray, {
   // Get morphed path array at given position
   at: function (pos) {
     // make sure a destination is defined
-    if (!this.destination) throw new Error('No destination set')
+    if (!this.destination) return this
 
     var sourceArray = this.value
     var destinationArray = this.destination.value

diff --git a/src/point.js b/src/point.js
index 72a9572651c03b4f31ac9dc257e7049d4456ffc9..682092e53835a9dc955d4ba7bab3b014e9325e05 100644 (file)
--- a/src/point.js
+++ b/src/point.js
@@ -32,7 +32,7 @@ SVG.Point = SVG.invent({
     // Get morphed point at a given position
     at: function (pos) {
       // make sure a destination is defined
-      if (!this.destination) throw new Error('No destination set')
+      if (!this.destination) return this
 
       // calculate morphed matrix at a given position
       var point = new SVG.Point({

diff --git a/src/pointarray.js b/src/pointarray.js
index 6229e2ee1c012bd973f097a349b6c9cdf6efe787..ecf5c40aff9044f14dbd6044062b2b4e505e3a47 100644 (file)
--- a/src/pointarray.js
+++ b/src/pointarray.js
@@ -32,7 +32,7 @@ SVG.extend(SVG.PointArray, {
   // Get morphed array at given position
   at: function (pos) {
     // make sure a destination is defined
-    if (!this.destination) throw new Error('No destination set')
+    if (!this.destination) return this
 
     // generate morphed point string
     for (var i = 0, il = this.value.length, array = []; i < il; i++) {