diff --git a/test/index.html b/test/index.html index e8bc8c4..937edd8 100644 --- a/test/index.html +++ b/test/index.html @@ -3,7 +3,8 @@ Moonshine Test Runner - + + diff --git a/vm/build/build b/vm/build/build index 8c1b7e2..40cda71 100755 --- 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 index 8b09c00..4c3be83 100644 --- 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 . */ + \ No newline at end of file diff --git a/vm/src/init.js b/vm/src/init.js new file mode 100644 index 0000000..8dbddbc --- /dev/null +++ b/vm/src/init.js @@ -0,0 +1,12 @@ + +(function () { + var originalValue = window.shine; + + window.shine = { + noConflict: function () { + window.shine = originalValue; + return this; + } + }; + +})();