Changeset 843602

Timestamp:

01/23/2014 07:27:39 AM (12 years ago)

Author:

ti2m

Message:

Legacy compatibility fix

Location:

edge-suite/trunk/includes

Files:

• edge-suite-comp-builder.inc (modified) (1 diff)
• edge-wordpress.js (modified) (1 diff)

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

@@ -430 +430 @@
 
     // Replace alterRegisterCompositionDefn() with custom call to alter
-    // symbols and fonts.
-    $register_pattern = '/Edge.registerCompositionDefn\(compId,\s?symbols,\s?fonts,\s?resources(,\s?opts)?\);/';
-    $register_replace = 'AdobeEdge.alterRegisterCompositionDefn(compId, symbols, fonts, resources, opts, Edge.registerCompositionDefn);';
-    $register_pattern_found = 0;
-    $content = preg_replace($register_pattern, $register_replace, $content, $register_pattern_found);
+    // symbols and fonts. Older EA versions don't have the opts parameter.
+    $register_pattern = '/Edge\.registerCompositionDefn\(compId,\s?symbols,\s?fonts,\s?resources(,\s?opts)?\);/';
+    $register_matches = array();
+    if (preg_match($register_pattern, $content, $register_matches)) {
+      $opts = 'null';
+      if (isset($register_matches[1])) {
+        $opts = 'opts';
+      }
+      $register_replace = 'AdobeEdge.alterRegisterCompositionDefn(compId,symbols,fonts,resources,' . $opts . ',Edge.registerCompositionDefn);';
+      $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.

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

@@ -77 +77 @@
 
   // Legacy opts parameter.
-  if (typeof registerCompositionDefn === 'undefined' && typeof opts === 'function'){
-    registerCompositionDefn = opts;
-    opts = null;
+  if (registerCompositionDefn.length === 4){
     registerCompositionDefn(compId, symbols, fonts, resources);
   }