Added shine.noConflict().

gamesys · Oct 29, 2014 · 7b4b7cd · 7b4b7cd
1 parent e69a84d
commit 7b4b7cd
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 1 deletion.
diff --git a/test/index.html b/test/index.html
@@ -3,7 +3,8 @@
 	<head>
 		<meta charset="utf-8">
 		<title>Moonshine Test Runner</title>
-
+
+		<script src="../vm/src/init.js"></script>
 		<script src="../vm/src/gc.js"></script>
 		<script src="../vm/src/EventEmitter.js"></script>
 		<script src="../vm/src/FileManager.js"></script>

diff --git a/vm/build/build b/vm/build/build
@@ -44,6 +44,7 @@ var switches = getSwitches(process.argv),
 
 
 	SOURCE_FILENAMES = [
+		'../src/init.js',
 		'../src/gc.js',
 		'../src/EventEmitter.js',
 		'../src/FileManager.js',

diff --git a/vm/build/header.js b/vm/build/header.js
@@ -19,3 +19,4 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+
diff --git a/vm/src/init.js b/vm/src/init.js
@@ -0,0 +1,12 @@
+
+(function () {
+	var originalValue = window.shine;
+
+	window.shine = {
+		noConflict: function () {
+			window.shine = originalValue;
+			return this;
+		}
+	};
+
+})();