Changeset 665554

Timestamp:

02/09/2013 10:50:51 AM (13 years ago)

Author:

ti2m

Message:

Bugfixes, jQuery no conflict, uninstall hook

Location:

edge-suite/trunk

Files:

• edge-suite.php (modified) (6 diffs)
• includes/edge-suite-comp-builder.inc (modified) (1 diff)
• readme.txt (modified) (4 diffs)

edge-suite/trunk/edge-suite.php

@@ -5 +5 @@
 Description: Upload Adobe Edge compositions to your website.
 Author: Timm Jansen
-Author URI: http://timm-jansen.net/
-Version: 0.4
+Author URI: http://www.timmjansen.com/
+Donate link: http://www.timmjansen.com/donate
+Version: 0.5
 */
 
-/*  Copyright 2012 Timm Jansen (email: info at timm-jansen.net)
+/*  Copyright 2013 Timm Jansen (email: info at timmjansen.com)
 
     This program is free software; you can redistribute it and/or modify
@@ -78 +79 @@
       );
     ";
-
-    // TODO: Is this the correct way to do this?
     require_once(ABSPATH . 'wp-admin/includes/upgrade.php');
     dbDelta($sql);
@@ -85 +84 @@
 
   // Default options.
-  add_option('edge_suite_max_size', 2);
+  add_option('edge_suite_max_size', 5);
   add_option('edge_suite_comp_default', -1);
   add_option('edge_suite_comp_homepage', 0);
@@ -101 +100 @@
 
 function edge_suite_uninstall() {
+  edge_suite_init_constants();
+
+  global $wpdb;
+  $table_name = $wpdb->prefix . "edge_suite_composition_definition";
+  if ($wpdb->get_var("show tables like '$table_name'") == $table_name) {
+    $wpdb->query('DROP TABLE ' . $table_name);
+  }
+
+  // Delete all edge directories
+  rmdir_recursive(trailingslashit(EDGE_SUITE_PUBLIC_DIR));
+
+  // Delete options
+  delete_option('edge_suite_max_size');
+  delete_option('edge_suite_comp_default');
+  delete_option('edge_suite_comp_homepage');
+  delete_option('edge_suite_deactivation_delete');
+  delete_option('edge_suite_widget_shortcode');
+  delete_option('edge_suite_jquery_noconflict');
+  delete_option('edge_suite_debug');
+}
+register_uninstall_hook(__FILE__, 'edge_suite_uninstall');
+
+
+function edge_suite_deactivate() {
   if(get_option('edge_suite_deactivation_delete') == 1){
-    edge_suite_init_constants();
-
-    global $wpdb;
-    $table_name = $wpdb->prefix . "edge_suite_composition_definition";
-    if ($wpdb->get_var("show tables like '$table_name'") == $table_name) {
-      $wpdb->query('DROP TABLE ' . $table_name);
-    }
-
-    // Delete all edge directories
-    rmdir_recursive(trailingslashit(EDGE_SUITE_PUBLIC_DIR));
-
-    // Delete options
-    delete_option('edge_suite_max_size');
-    delete_option('edge_suite_comp_default');
-    delete_option('edge_suite_comp_homepage');
-    delete_option('edge_suite_deactivation_delete');
-    delete_option('edge_suite_widget_shortcode');
-    delete_option('edge_suite_jquery_noconflict');
-    delete_option('edge_suite_debug');
-  }
-}
-
-register_deactivation_hook(__FILE__, 'edge_suite_uninstall');
-//register_uninstall_hook(__FILE__, 'edge_suite_uninstall');
+    edge_suite_uninstall();
+  }
+}
+register_deactivation_hook(__FILE__, 'edge_suite_deactivate');
 
 
@@ -164 +167 @@
   edge_suite_boot();
 
-  // Get default composition.
-  $definition_id = get_option('edge_suite_comp_default');
-
-  // Get homepage composition.
-  if (is_home()) {
-    if (get_option('edge_suite_comp_homepage') != 0) {
-      $definition_id = get_option('edge_suite_comp_homepage');
-    }
-  }
-  //Get post composition
-  else {
-    global $post;
-    $post_id = $post->ID;
-    $post_reference_id = get_post_meta($post_id, '_edge_composition', TRUE);
-    if (!empty($post_reference_id)) {
-      $definition_id = $post_reference_id;
-    }
-  }
-
-  // Render composition.
-  global $edge_suite;
-  $definition_res = edge_suite_comp_render($definition_id);
-  // Split scripts and stage so they can be used by the respective functions.
-  $edge_suite->scripts = isset($definition_res['scripts']) ? $definition_res['scripts'] : '';
-  $edge_suite->stage = isset($definition_res['stage']) ? $definition_res['stage'] : '';
-
+  if(!is_admin()){
+    // Get default composition.
+    $definition_id = get_option('edge_suite_comp_default');
+
+    // Get homepage composition.
+    if (is_home()) {
+      if (get_option('edge_suite_comp_homepage') != 0) {
+        $definition_id = get_option('edge_suite_comp_homepage');
+      }
+    }
+    //Get post composition
+    else {
+      global $post;
+      if(isset($post->ID)){
+        $post_id = $post->ID;
+        $post_reference_id = get_post_meta($post_id, '_edge_composition', TRUE);
+        if (!empty($post_reference_id)) {
+          $definition_id = $post_reference_id;
+        }
+      }
+    }
+
+    // Render composition.
+    global $edge_suite;
+    $definition_res = edge_suite_comp_render($definition_id);
+    // Split scripts and stage so they can be used by the respective functions.
+    $edge_suite->scripts = isset($definition_res['scripts']) ? $definition_res['scripts'] : '';
+    $edge_suite->stage = isset($definition_res['stage']) ? $definition_res['stage'] : '';
+  }
 }
 
@@ -226 +232 @@
 
 function edge_suite_menu() {
-  // Todo: Create icon.
-  // $icon_url = plugins_url('/edge-suite').'/admin/edge_icon.png';
-  $icon_url = '';
-  add_menu_page('Edge Suite', 'Edge Suite', 'edge_suite_administer', __FILE__, 'edge_suite_menu_main', $icon_url);
+  add_menu_page('Edge Suite', 'Edge Suite', 'edge_suite_administer', __FILE__, 'edge_suite_menu_main');
   add_submenu_page(__FILE__, 'Manage', 'Manage', 'edge_suite_administer', __FILE__, 'edge_suite_menu_main');
   add_submenu_page(__FILE__, 'Settings', 'Settings', 'edge_suite_administer', 'edge_suite_menu_settings', 'edge_suite_menu_settings');

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

@@ -319 +319 @@
     }
 
+    // Todo: Directory seems to always exist already
     // Delete old edge tmp dir.
     if (is_dir($destination)) {

edge-suite/trunk/readme.txt

@@ -13 +13 @@
 == Description ==
 
-Upload of compositions through a zipped archive. Integrate Adobe Edge Animate compositions seamlessly into your website.
+Upload of compositions through published OAM files. Integrate Adobe Edge Animate compositions seamlessly into your website.
 
-Since Edge Animate itself is still in pre-release this plugin is a moving target as well and should therefore not yet be used in production.
+Detailed tutorials on how to install and use Edge Suite can be found is here:
 
-There have been problems with unzipping composition archives on shared hosting plans due to the wordpress filesystem. More detailed info is available in the FAQ section.
+* <a href="http://edgedocks.com/content/edge-suite-integrate-edge-animate-wordpress">Edge Docks - written tutorial</a>
+* <a href="http://edgedocks.com/content/edge-suite-integrate-edge-animate-wordpress">Adobe TV - video tutorial</a>
 
-Roadmap: FTP Filesystem support, data injection
+More resources can be found at <a href="http://edgedocks.com/edge_suite_wp">EdgeDocks.com</a>.
 
-Please help to review and test the plugin. Feedback is appreciated.
-
-<a href="http://edgedocks.com/content/edge-suite-integrate-edge-animate-wordpress">Tutorial</a> on how to install and use Edge Suite. More resources can be found
-<a href="http://edgedocks.com/edge_suite_wp">EdgeDocks.com</a>.
+The plugin has been intensively tested over the last couple of months and seems to be rather stable, it is up to you though if you want to try and use it in production. If you experience
+any problems please open an issue in the support section. If you like the plugin please vote for it and let us know that it works for your wordpress version.
 
 == Features ==
 
-* Upload Edge Animate compositions within one zipped archive
+* Upload Edge Animate compositions through published OAM files
 * Manage all compositions
 * Easy placement of compositions on the website
+* Shortcode support for posts and widgets
+* Sharing of resources
+* jQuery no conflict mode
 
 == Frequently Asked Questions ==
@@ -38 +40 @@
 * Open the debug console in Chrome (mac: alt + cmd + j) or Firefox and check for JavaScript errors.
 
+= jQuery issues =
+
+ Try to enable jQuery no conflict mode in the settings page, this might resolve conflicts between Edge Animates
+ version of jQuery and other plugins.
+
+= Background animation =
+
+If you want to use your composition as a background animation, try the following CSS on your stage id, e.g. #Stage_mycomp
+
+    #Stage_mycomp{
+        position: absolute !important; /* That is not pretty, but no way around it. */
+        top: 0px; /* Aligns the animation with the top of the header (can be removed or changed) */
+        z-index: 5; /* Sets animation as overlay, set to negative value for background placement */
+
+        /* Only use the following if you want to center the animation */
+        left: 50%;
+        margin-left: -346px; /* Half the width of the stage */
+    }
+
 = Animations don't show up =
 
 Uploading worked but nothings shows up on the page. Things to check:
-
-* Edge Suite doesn't support minified/published projects yet. Just zip the raw project folder (without the publish folder)
 
 * Look at the source code of the page and search for:
@@ -53 +72 @@
 
 * For testing remove all other fancy JavaScript like galleries, slideshows, etc. that are placed alongside the animation, the JS might collide.
+
+* Enable the JS debug log in the settings
+
+* Enable jQuery no-conflict mode in the settings
 
 = Head Cleaner: Animations don't show up =
@@ -106 +129 @@
 = 0.3 =
 Changes to support Edge Animate version 1.0, minified files, oam files
+
+= 0.4 =
+Bugfixes
+
+= 0.5 =
+Bugfixes, jQuery no conflict mode, readme update
+
+
+