gistfile1.txt

From 0041c42942d2a0b9f58297626b1d06262082618a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?"J.=20Rene=CC=81e=20Beach"?= <[email protected]>
Date: Fri, 10 Aug 2012 17:55:59 -0400
Subject: [PATCH 1/1] Since jQuery is loaded through the AMD define method,
 the file doesn't need to also include the assignment of
 the jQuery scope object to window.jQuery.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: J. Renée Beach <[email protected]>
---
 .../spark/libraries/alohaeditor/lib/vendor/jquery-1.7.2.js   |   10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/docroot/profiles/spark/libraries/alohaeditor/lib/vendor/jquery-1.7.2.js b/docroot/profiles/spark/libraries/alohaeditor/lib/vendor/jquery-1.7.2.js
index cbcc60d..a12c384 100644
--- a/docroot/profiles/spark/libraries/alohaeditor/lib/vendor/jquery-1.7.2.js
+++ b/docroot/profiles/spark/libraries/alohaeditor/lib/vendor/jquery-1.7.2.js
@@ -9384,12 +9384,6 @@ jQuery.each( { Height: "height", Width: "width" }, function( name, type ) {
 	};
 });
 
-
-
-
-// Expose jQuery to the global object
-window.jQuery = window.$ = jQuery;
-
 // Expose jQuery as an AMD module, but only for AMD loaders that
 // understand the issues with loading multiple versions of jQuery
 // in a page that all might call define(). The loader will indicate
@@ -9405,6 +9399,10 @@ window.jQuery = window.$ = jQuery;
 if ( typeof define === "function" && define.amd && define.amd.jQuery ) {
 	define( "jquery", [], function () { return jQuery; } );
 }
+else {
+  // Expose jQuery to the global object
+  window.jQuery = window.$ = jQuery;
+}
 
 // ===================== PATCHES =====================
 // Work-around for http://bugs.jquery.com/ticket/9905
-- 
1.7.10.4