Merge remote branch 'cadecairos/t669' into develop

ScottDowne · Jul 29, 2011 · 19f4696 · 19f4696
2 parents c00a46f + 76a1736
commit 19f4696
Show file tree

Hide file tree

Showing 5 changed files with 71 additions and 70 deletions.
diff --git a/plugins/attribution/popcorn.attribution.js b/plugins/attribution/popcorn.attribution.js
diff --git a/plugins/code/popcorn.code.js b/plugins/code/popcorn.code.js
@@ -133,8 +133,8 @@
         }
       }
     };
-  },
-  {
+  }, 
+  { 
     about: {
       name: 'Popcorn Code Plugin',
       version: '0.1',

diff --git a/plugins/lastfm/popcorn.lastfm.js b/plugins/lastfm/popcorn.lastfm.js
@@ -57,20 +57,6 @@
 
 
     return {
-      manifest: {
-        about:{
-          name:    "Popcorn LastFM Plugin",
-          version: "0.1",
-          author:  "Steven Weerdenburg",
-          website: "http://sweerdenburg.wordpress.com/"
-        },
-        options:{
-          start    : {elem:'input', type:'text', label:'In'},
-          end      : {elem:'input', type:'text', label:'Out'},
-          target   : 'lastfm-container',
-          artist   : {elem:'input', type:'text', label:'Artist'}
-        }
-      },
 
       _setup: function( options ) {
         options._container = document.createElement( 'div' );
@@ -118,6 +104,20 @@
         document.getElementById( options.target ) && document.getElementById( options.target ).removeChild( options._container );
       }
     };
-  })());
+  })(),
+  {
+    about:{
+      name:    "Popcorn LastFM Plugin",
+      version: "0.1",
+      author:  "Steven Weerdenburg",
+      website: "http://sweerdenburg.wordpress.com/"
+    },
+    options:{
+      start    : {elem:'input', type:'text', label:'In'},
+      end      : {elem:'input', type:'text', label:'Out'},
+      target   : 'lastfm-container',
+      artist   : {elem:'input', type:'text', label:'Artist'}
+    }
+  });
 
 })( Popcorn );
diff --git a/plugins/processing/popcorn.processing.js b/plugins/processing/popcorn.processing.js
@@ -99,22 +99,6 @@
 
     return {
 
-      manifest: {
-        about: {
-          name: "Popcorn Processing Plugin",
-          version: "0.1",
-          author: "Christopher De Cairos, Benjamin Chalovich",
-          website: "cadecairos.blogspot.com, ben1amin.wordpress.org"
-        },
-        options: {
-          start :   { elem: "input", type: "text", label: "In" },
-          end :     { elem: "input", type: "text", label: "Out" },
-          target :  { elem: "input", type: "text", label: "Target" },
-          sketch :  { elem: "input", type: "text", label: "Sketch" },
-          noPause : { elem: "select", options: [ "TRUE", "FALSE" ], label: "No Loop" }
-        }
-      },
-
       _setup: function( options ) {
 
         options.codeReady = false;
@@ -139,5 +123,20 @@
         options.parentTarget && options.parentTarget.removeChild( options.canvas );
       }
     };
+  },
+  {
+    about: {
+      name: "Popcorn Processing Plugin",
+      version: "0.1",
+      author: "Christopher De Cairos, Benjamin Chalovich",
+      website: "cadecairos.blogspot.com, ben1amin.wordpress.org"
+    },
+    options: {
+      start :   { elem: "input", type: "text", label: "In" },
+      end :     { elem: "input", type: "text", label: "Out" },
+      target :  { elem: "input", type: "text", label: "Target" },
+      sketch :  { elem: "input", type: "text", label: "Sketch" },
+      noPause : { elem: "select", options: [ "TRUE", "FALSE" ], label: "No Loop" }
+    }
   });
 }( Popcorn ));
diff --git a/plugins/tagthisperson/popcorn.tagthisperson.js b/plugins/tagthisperson/popcorn.tagthisperson.js
@@ -47,22 +47,7 @@
   Popcorn.plugin( "tagthisperson" , ( function() {
 
     return {
-      manifest: {
-        about:{
-          name: "Popcorn tagthisperson Plugin",
-          version: "0.1",
-          author: "@annasob",
-          website: "annasob.wordpress.com"
-        },
-        options:{
-          start    : {elem:'input', type:'text', label:'In'},
-          end      : {elem:'input', type:'text', label:'Out'},
-          target   : 'tagthisperson-container',
-          person   : {elem:'input', type:'text', label:'Name'},
-          image    : {elem:'input', type:'text', label:'Image Src'},
-          href     : {elem:'input', type:'text', label:'URL'}   
-        }
-      },
+
       _setup: function( options ) {
         var exists = false;
         // loop through the existing objects to ensure no duplicates
@@ -104,6 +89,22 @@
         document.getElementById( options.target ).innerHTML = options._p.toString();
       }
    };
-  })());
+  })(),
+  {
+    about:{
+      name: "Popcorn tagthisperson Plugin",
+      version: "0.1",
+      author: "@annasob",
+      website: "annasob.wordpress.com"
+    },
+    options:{
+      start    : {elem:'input', type:'text', label:'In'},
+      end      : {elem:'input', type:'text', label:'Out'},
+      target   : 'tagthisperson-container',
+      person   : {elem:'input', type:'text', label:'Name'},
+      image    : {elem:'input', type:'text', label:'Image Src'},
+      href     : {elem:'input', type:'text', label:'URL'}   
+    }
+  });
 
 })( Popcorn );