Changeset 632663

Timestamp:

12/01/2012 12:06:27 PM (13 years ago)

Author:

ti2m

Message:

jQuery noconflict, inlineview functions

Location:

edge-suite/trunk

Files:

• admin/manage.php (modified) (1 diff)
• admin/options.php (modified) (1 diff)
• edge-suite.php (modified) (7 diffs)
• includes/edge-suite-comp-builder.inc (modified) (1 diff)
• includes/edge-suite-comp.inc (modified) (1 diff)
• includes/edge-suite-general.php (modified) (1 diff)
• includes/edge-wordpress.js (modified) (2 diffs)

edge-suite/trunk/admin/manage.php

@@ -9 +9 @@
 }
 
-if ($_POST['action'] == 'upload' && $_POST['upit'] == 'yes') {
-  edge_suite_process_upload();
-}
-elseif ($_POST['action'] == 'delete') {
-  edge_suite_process_delete();
+if(isset($_POST['action'])){
+  if ($_POST['action'] == 'upload' && isset($_POST['upit']) && $_POST['upit'] == 'yes') {
+    edge_suite_process_upload();
+  }
+  elseif ($_POST['action'] == 'delete') {
+    edge_suite_process_delete();
+  }
 }
 

edge-suite/trunk/admin/options.php

@@ -69 +69 @@
 
       <tr valign="top">
+          <th scope="row">jQuery NoConflict mode (experimental)</th>
+          <td>
+            <?php
+            $selected = intval(get_option('edge_suite_jquery_noconflict')) == 1 ? 'checked="checked"' : '';
+            ?>
+            <p><input type="checkbox" name="edge_suite_jquery_noconflict" value="1" <?php echo $selected; ?>"/>
+                Run a separate instance of jQuery for Edge Animate.</p>
+            <span class="setting-description">
+                Activate this option if you experience problems with other jQuery-based JavaScript plugins.
+                Edge Suite will initialize separate different jQuery versions.
+            </span>
+          </td>
+      </tr>
+
+      <tr valign="top">
+          <th scope="row">Edge Suite debug mode</th>
+          <td>
+            <?php
+            $selected = intval(get_option('edge_suite_debug')) == 1 ? 'checked="checked"' : '';
+            ?>
+            <p><input type="checkbox" name="edge_suite_debug" value="1" <?php echo $selected; ?>"/>
+                Run Edge Suite in debug mode</p>
+          </td>
+      </tr>
+
+      <tr valign="top">
           <th scope="row">Deactivation deletion</th>
           <td>

edge-suite/trunk/edge-suite.php

@@ -90 +90 @@
   add_option('edge_suite_deactivation_delete', 0);
   add_option('edge_suite_widget_shortcode', 0);
+  add_option('edge_suite_jquery_noconflict', 0);
+  add_option('edge_suite_debug', 0);
 
   // Create main edge suite directory.
@@ -117 +119 @@
     delete_option('edge_suite_deactivation_delete');
     delete_option('edge_suite_widget_shortcode');
+    delete_option('edge_suite_jquery_noconflict');
+    delete_option('edge_suite_debug');
   }
 }
@@ -133 +137 @@
   register_setting('edge_suite_options', 'edge_suite_deactivation_delete');
   register_setting('edge_suite_options', 'edge_suite_widget_shortcode');
+  register_setting('edge_suite_options', 'edge_suite_jquery_noconflict');
+  register_setting('edge_suite_options', 'edge_suite_debug');
 }
 
@@ -197 +203 @@
 function edge_suite_header() {
   global $edge_suite;
+  //TODO: use wp_enqueue_script()
   if(isset($edge_suite->scripts) && is_array($edge_suite->scripts)){
     print "\n" . implode("\n", $edge_suite->scripts) . "\n";
@@ -284 +291 @@
  */
 function edge_suite_save_post_reference($id) {
-  if (current_user_can('edge_suite_select_composition')) {
+  if (current_user_can('edge_suite_select_composition') && isset($_POST['edge_suite_composition'])) {
     $definition_id = intval($_POST['edge_suite_composition']);
     if ($definition_id != 0) {
@@ -367 +374 @@
 }
 
+function edge_suite_comp_view_iframe($definition_id, $css_style = ''){
+  return edge_suite_comp_iframe($definition_id, $css_style);
+}
+
+function edge_suite_comp_view_inline($definition_id, $css_style = ''){
+
+  $definition_res = edge_suite_comp_render($definition_id, $css_style);
+
+  $stage = $scripts = '';
+
+  if($definition_res != NULL){
+    $scripts = implode("\n", $definition_res['scripts']);
+    $stage = $definition_res['stage'];
+  }
+
+  return "\n" . $scripts . "\n" . $stage ."\n";
+}
+
+
 /**
  * Shortcode implementation for 'edge_animation'
@@ -405 +431 @@
   // Inline rendering
   else{
-    $definition_res = edge_suite_comp_render($definition_id, $styles);
-
-    $stage = $scripts = '';
-
-    if($definition_res != NULL){
-      // Todo: Placing scripts inline in the content really isn't pretty, but so far there
-      // doesn't seem to be an easy way around this, otherwise we need to handle shortcode
-      // before header fuctions get called.
-      $scripts = implode("\n", $definition_res['scripts']);
-
-      $stage = $definition_res['stage'];
-    }
-
-    return "\n" . $scripts . "\n" . $stage ."\n";
+    return edge_suite_comp_view_inline($definition_id, $styles);
   }
 

edge-suite/trunk/includes/edge-suite-comp-builder.inc

@@ -553 +553 @@
     $content = preg_replace($load_pattern, $load_replace, $content);
 
+    // Search for the okToLaunchComposition function call.
+    $launch_pattern = '/AdobeEdge\.okToLaunchComposition\(compId\)/';
+
+    // Replace original call with call to custom function, alters jQuery.
+    $launch_replace = 'AdobeEdge.alterOkToLaunchComposition(compId)';
+    $content = preg_replace($launch_pattern, $launch_replace, $content);
+
     // Find the end of the main JS function and inject to function calls to
     // alter preContent and dlContent DOM, see JS function doc.

edge-suite/trunk/includes/edge-suite-comp.inc

@@ -239 +239 @@
     $js_inline .= "AdobeEdge.pathPrefix.comps = AdobeEdge.pathPrefix.comps || {};";
     $js_inline .= "AdobeEdge.pathPrefix.comps['" . $definition->composition_id . "'] = '" . $project_path . "';";
+
+    if(get_option('edge_suite_debug') == 1){
+      $js_inline .= "AdobeEdge.edgesuiteDebug = 1;";
+    }
+
+    if(get_option('edge_suite_jquery_noconflict') == 1){
+      $js_inline .= "AdobeEdge.edgesuiteNoConflict = 1;";
+    }
 
     $scripts = array();

edge-suite/trunk/includes/edge-suite-general.php

@@ -37 +37 @@
   //Check if dir is writable and create directory structure.
   if (!mkdir_recursive(EDGE_SUITE_COMP_PROJECT_DIR)) {
-    $msg['create_folder'] = 'Edge Suite: Unable to create directory project directory (' . EDGE_SUITE_COMP_PROJECT_DIR . '). Is its parent directory writable by the server?';
+    $msg['create_folder'] = 'Edge Suite: Unable to create project directory (' . EDGE_SUITE_COMP_PROJECT_DIR . '). Is its parent directory writable by the server?';
   }
 

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

@@ -159 +159 @@
   }
 
-//  for(var i in AdobeEdge.thirdPartyLibs) {
-//    aLoader.push({load: AdobeEdge.thirdPartyLibs[i]});
-//  }
+  // Check if other jQuery version exist prior to the preloader run
+  if(typeof jQuery != 'undefined'){
+      if(!AdobeEdge.otherjQuery){
+          AdobeEdge.edgesuiteLogger('Other jQuery include exists: Version ' + jQuery().jquery);
+          if(AdobeEdge.edgesuiteNoConflict){
+              AdobeEdge.otherjQuery = jQuery;
+          }
+      }
+  }
+  else{
+      AdobeEdge.edgesuiteLogger('No other jQuery exists yet.');
+  }
 
   // Call the original loader with the modified aLoader object.
@@ -167 +176 @@
 }
 
+window.jQueryEdge = window.jQueryEdge || null;
+AdobeEdge.alterOkToLaunchComposition = function(comp){
+    if(AdobeEdge.edgesuiteNoConflict && typeof jQueryEdge != 'undefined'){
+        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);
+        }
+    }
+
+    // Fire composition launch
+    AdobeEdge.okToLaunchComposition(comp);
+}
+
+AdobeEdge.edgesuiteLogger = function(msg, level){
+    if(!level){
+        level = 'Info';
+    }
+    if(AdobeEdge.edgesuiteDebug){
+        console.log('[ DEBUG | EdgeSuite | ' + level + ']: ' + msg);
+    }
+}