From 6e36046b0f1cecfcbea2b3f6609ca97ecc9a551f Mon Sep 17 00:00:00 2001 From: David Seifried Date: Wed, 23 May 2012 11:32:57 -0400 Subject: [PATCH 1/2] [#908] Removed old reference to boolean and an old todo for checkboxes --- plugins/documentcloud/popcorn.documentcloud.js | 5 ++--- plugins/mustache/popcorn.mustache.js | 1 - 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/plugins/documentcloud/popcorn.documentcloud.js b/plugins/documentcloud/popcorn.documentcloud.js index 839a8dc3..ee3109f0 100644 --- a/plugins/documentcloud/popcorn.documentcloud.js +++ b/plugins/documentcloud/popcorn.documentcloud.js @@ -68,10 +68,9 @@ api - https://github.com/documentcloud/document-viewer/blob/master/public/javasc }, preload: { elem: "input", - type: "boolean", + type: "checkbox", label: "Preload", - default: true, - optional: true + default: true }, page: { elem: "input", diff --git a/plugins/mustache/popcorn.mustache.js b/plugins/mustache/popcorn.mustache.js index bfc33ce5..e654f4e0 100755 --- a/plugins/mustache/popcorn.mustache.js +++ b/plugins/mustache/popcorn.mustache.js @@ -198,7 +198,6 @@ type: "text", label: "Data" }, - /* TODO: how to show a checkbox/boolean? */ dynamic: { elem: "input", type: "checkbox", From 9cf07ce18a418fdc725428d0c51a2e35503af0ce Mon Sep 17 00:00:00 2001 From: David Seifried Date: Wed, 23 May 2012 11:36:16 -0400 Subject: [PATCH 2/2] [#908] Default is a keyword so had to change objects that had default as a property to 'default' --- plugins/documentcloud/popcorn.documentcloud.js | 4 ++-- plugins/facebook/popcorn.facebook.js | 18 +++++++++--------- plugins/flickr/popcorn.flickr.js | 8 ++++---- plugins/googlefeed/popcorn.googlefeed.js | 6 +++--- plugins/googlemap/popcorn.googlemap.js | 8 ++++---- plugins/image/popcorn.image.js | 6 +++--- plugins/lastfm/popcorn.lastfm.js | 2 +- plugins/lowerthird/popcorn.lowerthird.js | 6 +++--- plugins/mustache/popcorn.mustache.js | 2 +- plugins/openmap/popcorn.openmap.js | 6 +++--- 10 files changed, 33 insertions(+), 33 deletions(-) diff --git a/plugins/documentcloud/popcorn.documentcloud.js b/plugins/documentcloud/popcorn.documentcloud.js index ee3109f0..b366a41b 100644 --- a/plugins/documentcloud/popcorn.documentcloud.js +++ b/plugins/documentcloud/popcorn.documentcloud.js @@ -64,13 +64,13 @@ api - https://github.com/documentcloud/document-viewer/blob/master/public/javasc elem: "input", type: "text", label: "PDF URL" - default: "http://www.documentcloud.org/documents/70050-urbina-day-1-in-progress.html" + "default": "http://www.documentcloud.org/documents/70050-urbina-day-1-in-progress.html" }, preload: { elem: "input", type: "checkbox", label: "Preload", - default: true + "default": true }, page: { elem: "input", diff --git a/plugins/facebook/popcorn.facebook.js b/plugins/facebook/popcorn.facebook.js index e0154ff2..4925ae9d 100755 --- a/plugins/facebook/popcorn.facebook.js +++ b/plugins/facebook/popcorn.facebook.js @@ -102,14 +102,14 @@ elem: "input", type: "text", label: "Height", - default: "200", + "default": "200", optional: true }, width: { elem: "input", type: "text", label: "Width", - default: "200", + "default": "200", optional: true }, action: { @@ -122,14 +122,14 @@ elem: "input", type: "checkbox", label: "Stream", - default: false, + "default": false, optional: true }, header: { elem: "input", type: "checkbox", label: "Header", - default: false, + "default": false, optional: true }, layout: { @@ -142,7 +142,7 @@ elem: "input", type: "number", label: "Max_rows", - default: 1, + "default": 1, optional: true }, border_color: { @@ -167,28 +167,28 @@ elem: "input", type: "checkbox", label: "Showfaces", - default: false, + "default": false, optional: true }, recommendations: { elem: "input", type: "checkbox", label: "Recommendations", - default: false, + "default": false, optional: true }, always_post_to_friends: { elem: "input", type: "checkbox", label: "Always_post_to_friends", - default: false, + "default": false, optional: true }, num_posts: { elem: "input", type: "number", label: "Number_of_Comments", - default: 1, + "default": 1, optional: true } } diff --git a/plugins/flickr/popcorn.flickr.js b/plugins/flickr/popcorn.flickr.js index 1ea8c1a5..1c84a283 100755 --- a/plugins/flickr/popcorn.flickr.js +++ b/plugins/flickr/popcorn.flickr.js @@ -212,14 +212,14 @@ elem: "input", type: "text", label: "Height", - default: "50px", + "default": "50px", optional: true }, width: { elem: "input", type: "text", label: "Width", - default: "50px", + "default": "50px", optional: true }, padding: { @@ -232,13 +232,13 @@ elem: "input", type: "text", label: "Border", - default: "5px", + "default": "5px", optional: true }, numberofimages: { elem: "input", type: "number", - default: 4, + "default": 4, label: "Number of Images" } } diff --git a/plugins/googlefeed/popcorn.googlefeed.js b/plugins/googlefeed/popcorn.googlefeed.js index b87a39c0..72fc6edb 100755 --- a/plugins/googlefeed/popcorn.googlefeed.js +++ b/plugins/googlefeed/popcorn.googlefeed.js @@ -168,20 +168,20 @@ elem: "input", type: "url", label: "url", - default: "http://planet.mozilla.org/rss20.xml" + "default": "http://planet.mozilla.org/rss20.xml" }, title: { elem: "input", type: "text", label: "title", - default: "Planet Mozilla", + "default": "Planet Mozilla", optional: true }, orientation: { elem: "select", options: [ "Vertical", "Horizontal" ], label: "orientation", - default: "Vertical", + "default": "Vertical", optional: true } } diff --git a/plugins/googlemap/popcorn.googlemap.js b/plugins/googlemap/popcorn.googlemap.js index fe23291a..98e3066e 100755 --- a/plugins/googlemap/popcorn.googlemap.js +++ b/plugins/googlemap/popcorn.googlemap.js @@ -401,7 +401,7 @@ var googleCallback; elem: "input", type: "text", label: "Zoom", - default: 0, + "default": 0, optional: true }, lat: { @@ -420,20 +420,20 @@ var googleCallback; elem: "input", type: "text", label: "Location", - default: "Toronto, Ontario, Canada" + "default": "Toronto, Ontario, Canada" }, heading: { elem: "input", type: "text", label: "Heading", - default: 0, + "default": 0, optional: true }, pitch: { elem: "input", type: "text", label: "Pitch", - default: 1, + "default": 1, optional: true } } diff --git a/plugins/image/popcorn.image.js b/plugins/image/popcorn.image.js index f894976d..3d06a286 100755 --- a/plugins/image/popcorn.image.js +++ b/plugins/image/popcorn.image.js @@ -51,7 +51,7 @@ elem: "input", type: "url", label: "anchor URL", - default: "http://mozillapopcorn.org/wp-content/themes/popcorn/images/for_developers.png", + "default": "http://mozillapopcorn.org/wp-content/themes/popcorn/images/for_developers.png", optional: true }, target: "image-container", @@ -59,13 +59,13 @@ elem: "input", type: "url", label: "Source URL", - default: "http://mozillapopcorn.org/wp-content/themes/popcorn/images/for_developers.png" + "default": "http://mozillapopcorn.org/wp-content/themes/popcorn/images/for_developers.png" }, text: { elem: "input", type: "text", label: "Text", - default: "Popcorn.js", + "default": "Popcorn.js", optional: true } } diff --git a/plugins/lastfm/popcorn.lastfm.js b/plugins/lastfm/popcorn.lastfm.js index 2208b39f..b01fc6d8 100755 --- a/plugins/lastfm/popcorn.lastfm.js +++ b/plugins/lastfm/popcorn.lastfm.js @@ -132,7 +132,7 @@ elem: "input", type: "text", label: "Artist", - default: "the beatles" + "default": "the beatles" } } }); diff --git a/plugins/lowerthird/popcorn.lowerthird.js b/plugins/lowerthird/popcorn.lowerthird.js index 167e97eb..a858285d 100755 --- a/plugins/lowerthird/popcorn.lowerthird.js +++ b/plugins/lowerthird/popcorn.lowerthird.js @@ -54,20 +54,20 @@ elem: "input", type: "text", label: "Text", - default: "hello", + "default": "hello", optional: true }, name: { elem: "input", type: "text", label: "Text", - default: "Popcorn.js" + "default": "Popcorn.js" }, role: { elem: "input", type: "text", label: "Text", - default: "JavaScript library", + "default": "JavaScript library", optional: true } } diff --git a/plugins/mustache/popcorn.mustache.js b/plugins/mustache/popcorn.mustache.js index e654f4e0..3e8493df 100755 --- a/plugins/mustache/popcorn.mustache.js +++ b/plugins/mustache/popcorn.mustache.js @@ -202,7 +202,7 @@ elem: "input", type: "checkbox", label: "Dynamic", - default: true, + "default": true, optional: true } } diff --git a/plugins/openmap/popcorn.openmap.js b/plugins/openmap/popcorn.openmap.js index f6fc87ae..816b77a4 100755 --- a/plugins/openmap/popcorn.openmap.js +++ b/plugins/openmap/popcorn.openmap.js @@ -151,7 +151,7 @@ } ); options.map.addLayer( sLayer ); break; - default: /* case "ROADMAP": */ + "default": /* case "ROADMAP": */ // add OpenStreetMap layer projection = new OpenLayers.Projection( 'EPSG:900913' ); displayProjection = new OpenLayers.Projection( 'EPSG:4326' ); @@ -360,7 +360,7 @@ elem: "input", type: "number", label: "Zoom", - default: 2 + "default": 2 }, lat: { elem: "input", @@ -378,7 +378,7 @@ elem: "input", type: "text", label: "Location", - default: "Toronto, Ontario, Canada" + "default": "Toronto, Ontario, Canada" }, markers: { elem: "input",