Changeset 843378

Timestamp:

01/22/2014 10:26:22 PM (12 years ago)

Author:

ti2m

Message:

general compatibility updates, audio support, font support fix, data injection support

Location:

edge-suite/trunk

Files:

• admin/options.php (modified) (1 diff)
• edge-suite.php (modified) (3 diffs)
• includes/edge-suite-comp-builder.inc (modified) (3 diffs)
• includes/edge-suite-comp.inc (modified) (3 diffs)
• includes/edge-wordpress.js (modified) (5 diffs)

edge-suite/trunk/admin/options.php

@@ -51 +51 @@
         <span class="setting-description">
           File size in MB<br/>
-            This is the max size that your file uploads will be limited to. 2 MB is the default upload size.<br>
+            This is the max size that your file uploads will be limited to. 5 MB is the default upload size.<br>
             <?php print $file_size_hint; ?>
         </span>

edge-suite/trunk/edge-suite.php

@@ -52 +52 @@
 
 
-  define('EDGE_SUITE_ALLOWED_ASSET_EXTENSIONS', 'js|png|jpg|gif|svg|css');
+  define('EDGE_SUITE_ALLOWED_ASSET_EXTENSIONS', 'js|png|jpg|gif|svg|css|html|woff|eot|ttf|mp3|ogg|oga|wav|m4a|aac');
 
 
@@ -92 +92 @@
   add_option('edge_suite_debug', 0);
 
-  // Create main edge suite directory.
-  mkdir_recursive(trailingslashit(EDGE_SUITE_PUBLIC_DIR));
 }
 
@@ -381 +379 @@
 }
 
-function edge_suite_comp_view_inline($definition_id, $css_style = ''){
-
-  $definition_res = edge_suite_comp_render($definition_id, $css_style);
+function edge_suite_comp_view_inline($definition_id, $css_style = '', $data = array()){
+
+  $definition_res = edge_suite_comp_render($definition_id, $css_style, $data);
 
   $stage = $scripts = '';

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

@@ -365 +365 @@
       // Check if there were multiple main js files.
       if (count($main_edge_files) > 0) {
-        $msg_dir = substr($this->tmpDir, strlen($this->tmpDirBase));
-//        drupal_set_message('Multiple edge.js files found. Everything outside ' . $msg_dir . ' will be ignored.');
+//        $msg_dir = substr($this->tmpDir, strlen($this->tmpDirBase));
+//        $msg = 'Multiple edge.js files found. Everything outside ' . $msg_dir . ' will be ignored.';
       }
     }
@@ -431 +431 @@
     // Replace alterRegisterCompositionDefn() with custom call to alter
     // symbols and fonts.
-    $register_pattern = '/Edge.registerCompositionDefn\(compId,\s?symbols,\s?fonts,\s?resources\);/';
-    $register_replace = 'AdobeEdge.alterRegisterCompositionDefn(compId, symbols, fonts, resources, Edge.registerCompositionDefn);';
-    $content = preg_replace($register_pattern, $register_replace, $content);
+    $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);
 
     // Write modified file.
@@ -675 +676 @@
    */
   protected function moveEdgeFiles($src, $dest) {
-    global $wp_filesystem;
-    // TODO: Test.
-    $allowed_extensions = 'js,png,jpg,gif,svg,css,html';
-    // Strip spaces.
-    $allowed_extensions = str_replace(' ', '', $allowed_extensions);
-    // Replace commas.
-    $allowed_extensions = str_replace(',', '|', $allowed_extensions);
-    // Check if list is valid.
-    if (!preg_match('/^([a-zA-Z0-9]{2,6}\|)*([a-zA-Z0-9]{2,6})$/', $allowed_extensions)) {
-      $allowed_extensions = 'js|png|jpg|gif|svg|css|html';
-    }
-
-    $files = file_scan_directory($src, '/\.(' . $allowed_extensions . ')$/');
+
+    $files = file_scan_directory($src, '/\.(' . EDGE_SUITE_ALLOWED_ASSET_EXTENSIONS . ')$/');
     // TODO: Does this work with nested folders?
     // Todo: Check mimetype. Are mime types calculated from the file extension?

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

@@ -86 +86 @@
 
       $definition_id = $def_record['definition_id'];
+      if($definition_id == 0){
+        throw new Exception('Definition id of 0, database entry could not be created.');
+      }
       $def_name = edge_suite_comp_unique_name($def_record);
 
@@ -219 +222 @@
  *   Array with stage content and header scripts.
  */
-function edge_suite_comp_render($definition_id, $styles = '') {
+function edge_suite_comp_render($definition_id, $styles = '', $data = array()) {
   $scripts = array();
   $stage = '';
@@ -268 +271 @@
     }
 
+    // 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 . '">' . '</div>';
+    $stage = '<p><div id="' . $div_id . '" style="' . $height . $width . $styles . '" class="' . $definition->composition_id . '">' . $data_string .  '</div></p>';
 
   }

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

@@ -20 +20 @@
  *   Edge composition id
  */
-AdobeEdge.alterRegisterCompositionDefn = function (compId, symbols, fonts, resources, registerCompositionDefn) {
-
+AdobeEdge.alterRegisterCompositionDefn = function (compId, symbols, fonts, resources, opts, registerCompositionDefn) {
   // Check if one of the know patterns for the stage id can be found.
   var stage_name = "";
@@ -54 +53 @@
   }
 
-    for (var key in symbols) {
-        var dom = null;
-        // not minified version
-        if (symbols[key].content != undefined && symbols[key].content.dom != undefined) {
-            dom = symbols[key].content.dom;
-        }
-        // minified version
-        else if (symbols[key].cn != undefined && symbols[key].cn.dom != undefined) {
-            dom = symbols[key].cn.dom;
-        }
-        if(dom != null){
-            AdobeEdge.alterDomPaths(dom, compId);
-        }
-    }
+  for (var key in symbols) {
+    var dom = null;
+    // not minified version
+    if (symbols[key].content != undefined && symbols[key].content.dom != undefined) {
+        dom = symbols[key].content.dom;
+    }
+    // minified version
+    else if (symbols[key].cn != undefined && symbols[key].cn.dom != undefined) {
+        dom = symbols[key].cn.dom;
+    }
+    if(dom != null){
+        AdobeEdge.alterDomPaths(dom, compId);
+    }
+  }
 
 
@@ -77 +76 @@
   }
 
-  registerCompositionDefn(compId, symbols, fonts, resources);
+  // Legacy opts parameter.
+  if (typeof registerCompositionDefn === 'undefined' && typeof opts === 'function'){
+    registerCompositionDefn = opts;
+    opts = null;
+    registerCompositionDefn(compId, symbols, fonts, resources);
+  }
+  else {
+    registerCompositionDefn(compId, symbols, fonts, resources, opts);
+  }
 
 }
@@ -112 +119 @@
     if (fillProp != null && fillProp.length > 1 && fillProp[1] != null && typeof fillProp[1] == 'string' && fillProp[1].match(/\.(js|png|jpg|svg|gif)$/)) {
       fillProp[1] = AdobeEdge.pathPrefix.comps[compId] + '/' + fillProp[1];
+    }
+
+    // Handle audio files.
+    if (dom[key].hasOwnProperty('t') && dom[key].hasOwnProperty('sr') && dom[key].t === 'audio') {
+      var audio_sources = dom[key].sr;
+      for (var a = 0; a < audio_sources.length; a++) {
+        if(audio_sources[a].match(/\.(mp3)$/)) {
+          audio_sources[a] = AdobeEdge.pathPrefix.comps[compId] + '/' + audio_sources[a];
+        }
+      }
     }
 
@@ -145 +162 @@
     for (var prop in obj) {
       if (typeof(obj[prop]) == 'string') {
-        if (obj[prop].substr(obj[prop].length - 3) === ".js") {
+        if (!obj[prop].match(/^(?:https?:)?\/\//) && obj[prop].substr(obj[prop].length - 3) === ".js") {
           // If the file is a general edge library, add the lib path prefix.
           if (obj[prop].substr(0, "edge_includes/".length) === "edge_includes/") {