Changeset 633031

Timestamp:

12/02/2012 02:24:04 PM (13 years ago)

Author:

ti2m

Message:

usage of jQuery noconflict

File:

• edge-suite/trunk/includes/edge-wordpress.js (modified) (2 diffs)

edge-suite/trunk/includes/edge-wordpress.js

@@ -162 +162 @@
   if(typeof jQuery != 'undefined'){
       if(!AdobeEdge.otherjQuery){
+          AdobeEdge.otherjQuery = true;
           AdobeEdge.edgesuiteLogger('Other jQuery include exists: Version ' + jQuery().jquery);
-          if(AdobeEdge.edgesuiteNoConflict){
-              AdobeEdge.otherjQuery = jQuery;
-          }
       }
   }
@@ -178 +176 @@
 window.jQueryEdge = window.jQueryEdge || null;
 AdobeEdge.alterOkToLaunchComposition = function(comp){
-    if(AdobeEdge.edgesuiteNoConflict && typeof jQueryEdge != 'undefined'){
+    if(AdobeEdge.otherjQuery && AdobeEdge.edgesuiteNoConflict && jQueryEdge == null){
         AdobeEdge.edgesuiteLogger("Init 'edgejQuery' with: Version " + jQuery().jquery);
-        jQueryEdge = jQuery;
-        // AdobeEdge.edgesuiteLogger('jQuery NoConflict');
-        // jQuery.noConflict(true);
-        if(AdobeEdge.otherjQuery){
-            jQuery = AdobeEdge.otherjQuery;
-            AdobeEdge.edgesuiteLogger("Reset 'jQuery' to: Version " + jQuery().jquery);
-        }
+        jQueryEdge = jQuery.noConflict(true);
+        AdobeEdge.edgesuiteLogger("Reset 'jQuery' to: Version " + jQuery().jquery);
     }