From 1e8a366cd54ffeca428f5ad94567c67518a13e71 Mon Sep 17 00:00:00 2001
From: Fabian Jakobs <fabian.jakobs@web.de>
Date: Thu, 18 Aug 2011 14:10:51 +0200
Subject: [PATCH] resolve collision with existing requireJS on the page

---
 build_support/mini_require.js | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/build_support/mini_require.js b/build_support/mini_require.js
index 9e2bbce8..680758d7 100644
--- a/build_support/mini_require.js
+++ b/build_support/mini_require.js
@@ -46,13 +46,7 @@
 var global = (function() {
     return this;
 })();
-    
-// if we find an existing require function use it.
-if (global.require && global.define) {
-    require.packaged = true;
-    return;
-}
-    
+
 var _define = function(module, deps, payload) {
     if (typeof module !== 'string') {
         if (_define.original)
@@ -110,12 +104,13 @@ var _require = function(module, callback) {
             return _require.original.apply(window, arguments);
     }
 };
+_require.packaged = true;
 
 if (global.require)
     _require.original = global.require;
     
 global.require = _require;
-require.packaged = true;
+
 
 /**
  * Internal function to lookup moduleNames and resolve them by calling the