From f72e68d0206eb87a1165d7ddccd139c4faa531ca Mon Sep 17 00:00:00 2001
From: Amatan Head <dev.zelta@gmail.com>
Date: Mon, 18 Aug 2014 23:32:02 +0400
Subject: [PATCH 1/3] Added 'splice' function to the string object

---
 Docs/Types/String.md   | 29 +++++++++++++++++++++++++++++
 Source/Types/String.js |  4 ++++
 Specs/Types/String.js  |  9 +++++++++
 3 files changed, 42 insertions(+)

diff --git a/Docs/Types/String.md b/Docs/Types/String.md
index 9656e8e79..d35fea475 100644
--- a/Docs/Types/String.md
+++ b/Docs/Types/String.md
@@ -399,6 +399,34 @@ Strips the String of its *<script>* tags and anything in between them.
 
 
 
+String method: splice {#String:splice}
+--------------------------------------
+
+Similar to the [array.splice][], inserts a string before the specified position and removes unnecessary elements.
+
+### Syntax:
+
+	myString.splice(position, remove, insert);
+
+### Arguments:
+
+1. position - (*integer*) The position before which the insertion is made.
+1. remove - (*integer*) Length of the text to be removed.
+1. insert - (*string*) String to insert.
+
+### Returns:
+
+* (*string*) Modified string.
+
+### Examples:
+
+	'Hello, big world!'.splice(6, 4, ''); // returns 'Hello, world!'
+	'Add here'.splice(3, 0, ' substring'); // returns 'Add substring here'
+	'Replace this word'.splice(8, 4, 'that'); // returns 'Replace that word'
+	'You can count from an end'.splice(-6, 2, 'the'); // returns 'You can count from the end'
+
+
+
 [MDN String]: https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Global_Objects/String
 [MDN String:contains]: https://developer.mozilla.org/en-US/docs/JavaScript/Reference/Global_Objects/String/contains
 [MDN String:indexOf]: https://developer.mozilla.org/en-US/docs/JavaScript/Reference/Global_Objects/String/indexOf
@@ -411,3 +439,4 @@ Strips the String of its *<script>* tags and anything in between them.
 [String:trim]: #String:trim
 [Array:rgbToHex]: /core/Types/Array/#Array:rgbToHex
 [String:trim]: #String:trim
+[array.splice]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/splice
diff --git a/Source/Types/String.js b/Source/Types/String.js
index 47f96e659..ddad7ab7d 100644
--- a/Source/Types/String.js
+++ b/Source/Types/String.js
@@ -79,6 +79,10 @@ String.implement({
 			if (match.charAt(0) == '\\') return match.slice(1);
 			return (object[name] != null) ? object[name] : '';
 		});
+	},
+
+	splice: function(pos, rem, ins) {
+		return (this.slice(0,pos) + ins + this.slice(pos + Math.abs(rem)));
 	}
 
 });
diff --git a/Specs/Types/String.js b/Specs/Types/String.js
index a2c3096e6..8c2d3e35d 100644
--- a/Specs/Types/String.js
+++ b/Specs/Types/String.js
@@ -141,4 +141,13 @@ describe("String Methods", function(){
 		expect('this {should {break} mo} betta'.substitute({ 'break':'work' })).toEqual('this {should work mo} betta');
 	});
 
+	// String.splice
+
+	it('should add substrings and remove characters next to added', function () {
+		expect('Hello, big world!'.splice(6, 4, '')).toEqual('Hello, world!');
+		expect('Add here'.splice(3, 0, ' substring')).toEqual('Add substring here');
+		expect('Replace this word'.splice(8, 4, 'that')).toEqual('Replace that word');
+		expect('You can count from an end'.splice(-6, 2, 'the')).toEqual('You can count from the end');
+	});
+
 });

From 29a71f5e26b1f7dfe749db7e1b02be1af0e96fcc Mon Sep 17 00:00:00 2001
From: Amatan Head <dev.zelta@gmail.com>
Date: Tue, 19 Aug 2014 01:40:38 +0400
Subject: [PATCH 2/3] Added space

---
 Source/Types/String.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Types/String.js b/Source/Types/String.js
index ddad7ab7d..6455cb91b 100644
--- a/Source/Types/String.js
+++ b/Source/Types/String.js
@@ -82,7 +82,7 @@ String.implement({
 	},
 
 	splice: function(pos, rem, ins) {
-		return (this.slice(0,pos) + ins + this.slice(pos + Math.abs(rem)));
+		return (this.slice(0, pos) + ins + this.slice(pos + Math.abs(rem)));
 	}
 
 });

From 0010b01bdff49dc043fca0cf4a3c8e5873a41418 Mon Sep 17 00:00:00 2001
From: Amatan Head <dev.zelta@gmail.com>
Date: Tue, 19 Aug 2014 14:37:48 +0400
Subject: [PATCH 3/3] Splice is fully rewrited, specs and docs are augmented

---
 Docs/Types/String.md   | 20 ++++++++++++++------
 Source/Types/String.js |  9 +++++++--
 Specs/Types/String.js  | 35 +++++++++++++++++++++++++++++++----
 3 files changed, 52 insertions(+), 12 deletions(-)

diff --git a/Docs/Types/String.md b/Docs/Types/String.md
index d35fea475..edb4d448f 100644
--- a/Docs/Types/String.md
+++ b/Docs/Types/String.md
@@ -406,24 +406,32 @@ Similar to the [array.splice][], inserts a string before the specified position
 
 ### Syntax:
 
-	myString.splice(position, remove, insert);
+	myString.splice(position, remove[, element1[, ...[, elementN]]][, changes]);
 
 ### Arguments:
 
-1. position - (*integer*) The position before which the insertion is made.
+1. position - (*integer*) The position before which the operation is performed.
+   Use negative numbers to count from the end: -1 to append, -2 to insert before last character etc.
 1. remove - (*integer*) Length of the text to be removed.
-1. insert - (*string*) String to insert.
+1. elements - (*string*, optional) Strings to insert. Or anything which can be converted to a string.
+   If you don't specify any, splice simply removes characters.
+1. changes - (*boolean*, optional) If you wish to know what was removed, set this flag true.
+   Any boolean value at the end of the args array will be recognized as changes flag.
 
 ### Returns:
 
 * (*string*) Modified string.
+* (*array*) If the changes flag is set, returns an array of two strings: modified string and removed string.
 
 ### Examples:
 
-	'Hello, big world!'.splice(6, 4, ''); // returns 'Hello, world!'
-	'Add here'.splice(3, 0, ' substring'); // returns 'Add substring here'
+	'Hello, big world!'.splice(6, 4); // returns 'Hello, world!'
+	'Add here'.splice(3, 0, ' two', ' substrings'); // returns 'Add two substrings here'
 	'Replace this word'.splice(8, 4, 'that'); // returns 'Replace that word'
-	'You can count from an end'.splice(-6, 2, 'the'); // returns 'You can count from the end'
+	'You can count from an end'.splice(-7, 2, 'the'); // returns 'You can count from the end'
+	'Such a beautiful'.splice(-1, 0, ' array: ', [1, 1, 2, 3, 5]) // returns 'Such a beautiful array: 1,1,2,3,5'
+	'You can get removed string'.splice(12, 14, 'into ', 'the car', true) // returns ['You can get into the car', 'removed string']
+	'You can get removed string'.splice(12, 14, 'into ', 'the car', false) // returns 'You can get into the car'
 
 
 
diff --git a/Source/Types/String.js b/Source/Types/String.js
index 6455cb91b..4df805a4a 100644
--- a/Source/Types/String.js
+++ b/Source/Types/String.js
@@ -81,8 +81,13 @@ String.implement({
 		});
 	},
 
-	splice: function(pos, rem, ins) {
-		return (this.slice(0, pos) + ins + this.slice(pos + Math.abs(rem)));
+	splice: function() {
+		arguments[0] += (arguments[0] < 0 ? this.length + 1 : 0);
+		var return_both = (typeof arguments[arguments.length - 1] === 'boolean' ? arguments[--arguments.length] : false),
+			t = this.split(""),
+			change = t.splice.apply(t, arguments).join(""),
+			out = t.join("");
+		return (return_both ? [out, change] : out);
 	}
 
 });
diff --git a/Specs/Types/String.js b/Specs/Types/String.js
index 8c2d3e35d..aeb60b04e 100644
--- a/Specs/Types/String.js
+++ b/Specs/Types/String.js
@@ -143,11 +143,38 @@ describe("String Methods", function(){
 
 	// String.splice
 
-	it('should add substrings and remove characters next to added', function () {
-		expect('Hello, big world!'.splice(6, 4, '')).toEqual('Hello, world!');
-		expect('Add here'.splice(3, 0, ' substring')).toEqual('Add substring here');
+	it('should remove characters', function () {
+		expect('Hello, big world!'.splice(6, 4)).toEqual('Hello, world!');
+		expect('Hello, big world!'.splice(6, -4)).toEqual('Hello, big world!');
+		expect('Hello, big world!'.splice(6, -4)).not.toEqual('Hello, world!');
+		expect('Hello, big world!'.splice(100, 5)).toEqual('Hello, big world!');
+		expect('Hello, big world!'.splice(100, 5)).not.toEqual('Hello, world!');
+		expect('Hello, big world!'.splice(-11, 4)).toEqual('Hello, world!');
+		expect('Hello, big world!'.splice(5, 100)).toEqual('Hello');
+	});
+
+	it('should add strings and objects', function () {
+		expect('Add here'.splice(3, 0, ' two', ' substrings')).toEqual('Add two substrings here');
+		expect('Such a beautiful'.splice(-1, 0, ' array: ', [1, 1, 2, 3, 5])).toEqual('Such a beautiful array: 1,1,2,3,5');
+		expect('Add here'.splice(-6, 0, ' substring')).toEqual('Add substring here');
+		expect('Add here'.splice(100, 0, ' a substring')).toEqual('Add here a substring');
+		expect('added here'.splice(-100, 0, 'Substring is ')).toEqual('Substring is added here');
+	});
+
+	it('should combine both add strings and remove characters next to added', function () {
 		expect('Replace this word'.splice(8, 4, 'that')).toEqual('Replace that word');
-		expect('You can count from an end'.splice(-6, 2, 'the')).toEqual('You can count from the end');
+		expect('You can count from an end'.splice(-7, 2, 'the', ' very')).toEqual('You can count from the very end');
+	});
+
+	it('should recognize flag', function () {
+		expect('Hello, big world!'.splice(6, 4, true)).toEqual(['Hello, world!', ' big']);
+		expect('Add here'.splice(100, 0, ' a substring', true)).toEqual(['Add here a substring', '']);
+		expect('Replace this word'.splice(8, 4, 'that', true)).toEqual(['Replace that word', 'this']);
+		expect('Hello, big world!'.splice(6, 4, false)).toEqual('Hello, world!');
+		expect('Add here'.splice(100, 0, ' a substring', false)).toEqual('Add here a substring');
+		expect('Replace this word'.splice(8, 4, 'that', false)).toEqual('Replace that word');
+		expect('You can get removed string'.splice(12, 14, 'into ', 'the car', true)).toEqual(['You can get into the car', 'removed string']);
+		expect('Such a beautiful'.splice(-1, 0, ' array: ', [1, 1, 2, 3, 5], true)).toEqual(['Such a beautiful array: 1,1,2,3,5', '']);
 	});
 
 });