Changeset 893871

Timestamp:

04/15/2014 10:12:24 PM (12 years ago)

Author:

dtelepathy

Message:

Committing after merging in the jsonp branch.

Location:

filament/branches/redesign

Files:

• . (modified) (1 prop)
• .editorconfig (added)
• .jshintrc (added)
• filament.php (modified) (6 diffs)
• readme.txt (modified) (1 diff)

filament/branches/redesign/filament.php

@@ -4 +4 @@
 Plugin URI: http://filament.io/
 Description: Install & manage all your Web apps from a single place. Connect your website to Filament with this plugin, and never bug your developers again!
-Version: 1.1.0
+Version: 1.2.0
 Author: dtelepathy
 Author URI: http://www.dtelepathy.com/
@@ -31 +31 @@
     var $slug = "filament";
     var $menu_hooks = array();
-    var $version = '1.1.0';
+    var $version = '1.2.0';
 
     /**
@@ -97 +97 @@
     }
 
-
     /**
      * Define the admin menu options for this plugin
@@ -132 +131 @@
      */
     public function ajax_taxonomy_structure() {
-        header( 'Content-type: application/json' );
+        $header = "application/json";
+
+        if( isset( $_REQUEST['callback'] ) ) {
+          $callback = preg_replace( "/([^A-Za-z0-9_\$\.]+)/", "", $_REQUEST['callback'] );
+          $header =  "application/javascript";
+        }
+
+        header( 'Content-type: ' . $header );
 
         $structure = array(
@@ -142 +148 @@
         $post_types = wp_cache_get( 'post_types', $this->slug );
         if( !$post_types ) {
-            $post_types = get_post_types( array( 'public' => true ) );
+            $post_types = array();
+            $post_type_slugs = get_post_types( array( 'public' => true ) );
+
+            foreach( $post_type_slugs as $post_type_slug ) $post_types[] = get_post_type_object( $post_type_slug );
+
             wp_cache_set( 'post_types', $post_types, $this->slug, 3600 );
         }
@@ -158 +168 @@
         }
 
-        $structure['post_types'] = array_values( $post_types );
-        foreach( $categories as $category ) $structure['categories'][] = $category->slug;
-        foreach( $tags as $tag ) $structure['tags'][] = $tag->slug;
-
-        exit( json_encode( $structure ) );
+        foreach( $post_types as $post_type ) $structure['post_types'][$post_type->name] = $post_type->label;
+        foreach( $categories as $category ) $structure['categories'][$category->slug] = $category->name;
+        foreach( $tags as $tag ) $structure['tags'][$tag->slug] = $tag->name;
+
+        $data = json_encode( $structure );
+
+        if( isset( $callback ) && !empty( $callback ) ) {
+            $data = "$callback($data)";
+        }
+
+        exit( $data );
     }
 

filament/branches/redesign/readme.txt

@@ -47 +47 @@
 
 == Changelog ==
+= 1.2.0 =
+* Modify AJAX end-point to respond to JSONP requests with a _REQUEST['callback'] parameter
+* Restructure post_types structure in AJAX end-point response to respond with a key/value pair of name and label
+* Plugin UI redesign
+
 = 1.1.0 =
 * Add save messaging to admin view