Changeset 1042760

Timestamp:

12/11/2014 03:37:34 PM (11 years ago)

Author:

ti2m

Message:

EA 5 updates

Location:

edge-suite/trunk

Files:

• edge-suite.php (modified) (1 diff)
• includes/edge-suite-comp-builder.inc (modified) (7 diffs)
• includes/edge-suite-comp.inc (modified) (2 diffs)

edge-suite/trunk/edge-suite.php

@@ -178 +178 @@
     else {
       global $post;
-      if(isset($post->ID)){
+      if(isset($post->ID) && is_single()){
         $post_id = $post->ID;
         $post_reference_id = get_post_meta($post_id, '_edge_composition', TRUE);

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

@@ -238 +238 @@
 
     // Alter main JS edge file to so it calls custom JS from edge_drupal.js.
-    $this->alterMainEdgeJs();
+    $alteredMain = $this->alterMainEdgeJs();
 
     // Alter preload JS file so it calls custom JS from edge_drupal.js.
-    $this->alterPreloaderJs();
+    $alteredPreloader = $this->alterPreloaderJs();
 
     // Read in all the libraries and copy them to a shared edge library folder.
     $this->readLibs($replace_libraries);
+
+    if (!$alteredMain && !$alteredPreloader && empty($this->edgeVersion)) {
+      $this->parseRuntimeVersion();
+    }
 
     // Move all assets (and the _edgeAction.js)
@@ -387 +391 @@
       $this->preloaderFile = $js_file_tmp;
     }
-    else {
-      throw new Exception('Cannot find main JS edge file ' . $js_file_tmp . '.');
-    }
   }
 
@@ -401 +402 @@
    */
   protected function alterMainEdgeJs() {
+    $altered = FALSE;
     $file = $this->mainEdgeJS;
     // Do an extensive file / permission check as this seems to fail with many server configs.
@@ -421 +423 @@
     // The relevant JS structure (might be minified).
     // (function($, Edge, compId){....})(jQuery, AdobeEdge, "MyProject");.
-    $pattern = '/}\)\(jQuery,\s?AdobeEdge,\s?\"([a-zA-Z0-9_-]*)\"/';
+    // (function($, Edge, compId){....})(AdobeEdge.$, AdobeEdge, "MyProject");
+    $pattern = '/}\)\((?:AdobeEdge\.\$|jQuery),\s?AdobeEdge,\s?\"([a-zA-Z0-9_-]*)\"/';
     $matches = array();
     $found = preg_match($pattern, $content, $matches);
@@ -434 +437 @@
     $register_matches = array();
     if (preg_match($register_pattern, $content, $register_matches)) {
+      $altered = TRUE;
       $opts = 'null';
       if (isset($register_matches[1])) {
@@ -441 +445 @@
       $register_pattern_found = 0;
       $content = preg_replace($register_pattern, $register_replace, $content, -1, $register_pattern_found);
-    }
-    else {
-      throw new Exception('Unable to alter register handler.');
-    }
-
-    // Write modified file.
-    $fh = fopen($file, "w");
-    fwrite($fh, $content);
-    fclose($fh);
+
+      // Write modified file.
+      $fh = fopen($file, "w");
+      fwrite($fh, $content);
+      fclose($fh);
+    }
+    return $altered;
+  }
+
+
+  protected function parseRuntimeVersion(){
+    $file = $this->tmpDir . '/' . $this->projectName . '.html';
+    // Do an extensive file / permission check as this seems to fail with many server configs.
+    if(!file_exists($file)){
+      throw new Exception('Main edge file ' . $file . ' does not exist.');
+    }
+
+    if(!is_readable($file)){
+      throw new Exception('Main edge file' . $file . ' exists but is not readable.');
+    }
+
+    $content = file_get_contents($file);
+    if(!isset($content) || empty($content)){
+      throw new Exception('Main edge file ' . $file . ' does exist, cleared is_readable check, but can not be read.');
+    }
+
+    $runtime_pattern = '/animate\.adobe\.com\/runtime\/(\d\.\d\.\d)\//';
+    $matches = array();
+    if (preg_match($runtime_pattern, $content, $matches)) {
+      $this->edgeVersion = $matches[1];
+    }
   }
 
@@ -555 +581 @@
    */
   protected function alterPreloaderJs() {
-    $file = $this->preloaderFile;
-    $content = file_get_contents($file);
-
-    // Search for the loadResource function call.
-    $load_pattern = '/loadResources\(aLoader,\s?doDelayLoad\);/';
-
-    // Replace original call with call to custom function, alters preload paths.
-    $load_replace = 'AdobeEdge.alterPreloadPaths(compId, aLoader, doDelayLoad, loadResources);';
-    $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.
-    // Expected structure (might be minified).
-    // (function(compId){...})("MyProject").
-    $dom_pattern = '/\}\)\(\s?\"' . $this->stageClass . '\"\);/';
-    $dom_replace = 'AdobeEdge.alterDomPaths(preContent.dom, compId);' . "\n";
-    $dom_replace .= 'AdobeEdge.alterDomPaths(dlContent.dom, compId);' . "\n";
-    $dom_replace .= '})("' . $this->stageClass . '");';
-    $content = preg_replace($dom_pattern, $dom_replace, $content);
-
-    // Write new file.
-    $fh = fopen($file, "w");
-    fwrite($fh, $content);
-    fclose($fh);
+    $altered = FALSE;
+
+    if ($this->preloaderFile != NULL) {
+      $file = $this->preloaderFile;
+      $content = file_get_contents($file);
+
+      // Search for the loadResource function call.
+      $load_pattern = '/loadResources\(aLoader,\s?doDelayLoad\);/';
+
+      if (preg_match($load_pattern, $content)) {
+        $altered = TRUE;
+        // Replace original call with call to custom function, alters preload paths.
+        $load_replace = 'AdobeEdge.alterPreloadPaths(compId, aLoader, doDelayLoad, loadResources);';
+        $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.
+        // Expected structure (might be minified).
+        // (function(compId){...})("MyProject").
+        $dom_pattern = '/\}\)\(\s?\"' . $this->stageClass . '\"\);/';
+        $dom_replace = 'AdobeEdge.alterDomPaths(preContent.dom, compId);' . "\n";
+        $dom_replace .= 'AdobeEdge.alterDomPaths(dlContent.dom, compId);' . "\n";
+        $dom_replace .= '})("' . $this->stageClass . '");';
+        $content = preg_replace($dom_pattern, $dom_replace, $content);
+
+        // Write new file.
+        $fh = fopen($file, "w");
+        fwrite($fh, $content);
+        fclose($fh);
+      }
+    }
+    return $altered;
   }
 

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

@@ -223 +223 @@
  */
 function edge_suite_comp_render($definition_id, $styles = '', $data = array()) {
+  global $edge_suite;
   $scripts = array();
   $stage = '';
@@ -237 +238 @@
     $preload_url = $project_path . '/' . $definition->project_name . '_edgePreload.js';
 
-    $js_inline = 'window.AdobeEdge = window.AdobeEdge || {};';
-    $js_inline .= 'window.AdobeEdge.pathPrefix = window.AdobeEdge.pathPrefix || {};';
-    $js_inline .= "AdobeEdge.pathPrefix.libs = '" . $edge_lib_path . "';";
-    $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();
-    $scripts[] = '<script type="text/javascript">' . $js_inline . '</script>';
-    $scripts[] = '<script type="text/javascript" src="' . plugins_url('/edge-suite') . '/includes/edge-wordpress.js"></script>';
-    $scripts[] = '<script type="text/javascript" src="' . $preload_url . '"></script>';
-
-
-    $div_id = 'Stage_' . $definition->project_name_unique;
-
-    // Add dimension if it was possible to parse them. This avoids jumping of the
-    // empty divs when using multiple instances on one page.
-    $height = '';
-    if (isset($definition->info->height) && intval($definition->info->height) > 0) {
-      $height = 'height:' . $definition->info->height . ';';
-    }
-
-    $width = '';
-    if (isset($definition->info->width) && intval($definition->info->width) > 0) {
-      $width = 'width:' . $definition->info->width . ';';
-    }
-
-    // Generate JSON data for more advanced animations, if supplied.
-    $data_string = '';
-    if (isset($data) && !empty($data)) {
-      $data_string = '<script class="data" type="text/data">' . json_encode($data) . '</script>';
-    }
-
-    // Put everything together.
-    $stage = '<div id="' . $div_id . '" style="' . $height . $width . $styles . '" class="' . $definition->composition_id . '">' . $data_string .  '</div>';
-
+    $runtime_version = !isset($definition->info->version) || empty($definition->info->version) ? NULL : $definition->info->version;
+    if (!isset($edge_suite->runtime_version) || $runtime_version == NULL || $runtime_version == $edge_suite->runtime_version) {
+      if (!isset($edge_suite->runtime_version) && $runtime_version != NULL) {
+        $edge_suite->runtime_version = $runtime_version;
+      }
+
+      if (isset($definition->info->version) && !empty($definition->info->version) && $definition->info->version >= 5) {
+        $js_inline = '';
+        if ($edge_suite->runtime_version == $definition->info->version) {
+          $edge_suite->runtime_version = $definition->info->version;
+
+          if (!isset($edge_suite->runtime_added)) {
+            $edge_suite->runtime_added = TRUE;
+            $runtime = "//animate.adobe.com/runtime/" . $definition->info->version . "/edge." . $definition->info->version . ".min.js";
+            // Mainly copied from the .html file of an OAM. To make multiple
+            // compositions on one page work the runtime can only be loaded
+            // once. When the runtime has loaded, ALL compositions on the page
+            // need to be triggered to load, not just one. Therefor ES registers
+            // each comp in a special variable (EdgeSuite.compositions) and
+            // triggers all comps with their respective data.
+            $js_inline .= 'var script = document.createElement("script");
+            script.type= "text/javascript";
+            script.src = "' . $runtime . '";
+            var head = document.getElementsByTagName("head")[0], done=false;
+            script.onload = script.onreadystatechange = function(){
+              if (!done && (!this.readyState || this.readyState == "loaded" || this.readyState == "complete")) {
+                done=true;
+                for(var c = 0; c < EdgeSuite.compositions.length; c++){
+                  var comp = EdgeSuite.compositions[c];
+                  var preloader = comp.hasPreloaderFile ? null : {};
+                  var dlstage = preloader;
+                  AdobeEdge.loadComposition(comp.name, comp.id, {htmlRoot:comp.path, bScaleToParent:"true"}, preloader, dlstage);
+                }
+                script.onload = script.onreadystatechange = null;
+                head.removeChild(script);
+              }
+            };
+            head.appendChild(script);';
+          }
+
+          // Add composition data.
+          $js_inline .= 'window.EdgeSuite = window.EdgeSuite || {compositions:[]};';
+          // If hasPreloaderFile is false then the above JS code will pass empty
+          // objects as preloader and donwlevel stage options to the
+          // loadComposition call. Otherwise EA will try to load a preloader
+          // file.
+          $comp_js_data = array(
+            'name' => $definition->project_name,
+            'id' => $definition->composition_id,
+            'path' => $project_path . '/',
+            'hasPreloaderFile' => file_exists($preload_url)
+          );
+          $js_inline .= 'window.EdgeSuite.compositions.push(' . json_encode($comp_js_data) . ')';
+
+          // Clean up JS code, remove linebreaks and leading line spaces.
+          $js_inline = preg_replace("/\n(\s)*/", "", $js_inline);
+        }
+        else {
+          $js_inline = 'console.log("Compositions with varying runtime versions have been detected. This would cause all compositions to fail, some have been disabled. Upgrade older compositions to the current runtime.");';
+        }
+        $scripts[] = '<script type="text/javascript">' . $js_inline . '</script>';
+      }
+      else {
+        $js_inline = 'window.AdobeEdge = window.AdobeEdge || {};';
+        $js_inline .= 'window.AdobeEdge.pathPrefix = window.AdobeEdge.pathPrefix || {};';
+        $js_inline .= "AdobeEdge.pathPrefix.libs = '" . $edge_lib_path . "';";
+        $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[] = '<script type="text/javascript">' . $js_inline . '</script>';
+        $scripts[] = '<script type="text/javascript" src="' . plugins_url('/edge-suite') . '/includes/edge-wordpress.js"></script>';
+        $scripts[] = '<script type="text/javascript" src="' . $preload_url . '"></script>';
+      }
+
+      $div_id = 'Stage_' . $definition->project_name_unique;
+
+      // Add dimension if it was possible to parse them. This avoids jumping of the
+      // empty divs when using multiple instances on one page.
+      $height = '';
+      if (isset($definition->info->height) && intval($definition->info->height) > 0) {
+        $height = 'height:' . $definition->info->height . ';';
+      }
+
+      $width = '';
+      if (isset($definition->info->width) && intval($definition->info->width) > 0) {
+        $width = 'width:' . $definition->info->width . ';';
+      }
+
+      // Generate JSON data for more advanced animations, if supplied.
+      $data_string = '';
+      if (isset($data) && !empty($data)) {
+        $data_string = '<script class="data" type="text/data">' . json_encode($data) . '</script>';
+      }
+
+      // Put everything together.
+      $stage = '<div id="' . $div_id . '" style="' . $height . $width . $styles . '" class="' . $definition->composition_id . '">' . $data_string . '</div>';
+    }
+    else {
+      $js_inline = 'console.log("Edge Suite - Compositions with varying runtime versions have been detected. This would cause all compositions to fail, therefore some animations have been disabled. Upgrade older compositions to the current runtime.");';
+      $scripts[] = '<script type="text/javascript">' . $js_inline . '</script>';
+    }
   }