From b6322459eaba1efcd290666bd79ff9279a827b25 Mon Sep 17 00:00:00 2001 From: Matthew Schranz Date: Tue, 22 May 2012 09:18:16 -0400 Subject: [PATCH] [#1019] Created a standard naming for all common manifest options. Fixed labeling on all. --- plugins/attribution/popcorn.attribution.js | 16 +++++----- plugins/code/popcorn.code.js | 8 ++--- .../documentcloud/popcorn.documentcloud.js | 10 +++---- plugins/facebook/popcorn.facebook.js | 30 +++++++++---------- plugins/flickr/popcorn.flickr.js | 12 ++++---- plugins/footnote/popcorn.footnote.js | 8 ++--- plugins/gml/popcorn.gml.js | 10 +++---- plugins/googlefeed/popcorn.googlefeed.js | 14 ++++----- plugins/googlemap/popcorn.googlemap.js | 10 +++---- plugins/image/popcorn.image.js | 21 ++++++------- plugins/lastfm/popcorn.lastfm.js | 8 ++--- plugins/linkedin/popcorn.linkedin.js | 14 ++++----- plugins/lowerthird/popcorn.lowerthird.js | 14 ++++----- plugins/mediaspawner/popcorn.mediaspawner.js | 4 +-- plugins/mustache/popcorn.mustache.js | 8 ++--- plugins/openmap/popcorn.openmap.js | 10 +++---- plugins/processing/popcorn.processing.js | 14 ++++----- plugins/rdio/popcorn.rdio.js | 10 +++---- plugins/subtitle/popcorn.subtitle.js | 4 +-- .../tagthisperson/popcorn.tagthisperson.js | 14 ++++----- plugins/text/popcorn.text.js | 8 ++--- plugins/timeline/popcorn.timeline.js | 16 +++++----- plugins/tumblr/popcorn.tumblr.js | 28 ++++++++--------- plugins/twitter/popcorn.twitter.js | 10 +++---- plugins/webpage/popcorn.webpage.js | 10 +++---- plugins/wikipedia/popcorn.wikipedia.js | 14 ++++----- plugins/wordriver/popcorn.wordriver.js | 8 ++--- 27 files changed, 165 insertions(+), 168 deletions(-) diff --git a/plugins/attribution/popcorn.attribution.js b/plugins/attribution/popcorn.attribution.js index 6f22ae50..8e96e35f 100755 --- a/plugins/attribution/popcorn.attribution.js +++ b/plugins/attribution/popcorn.attribution.js @@ -144,13 +144,13 @@ options:{ start: { elem: "input", - type: "text", - label: "In" + type: "number", + label: "Start" }, end: { elem: "input", - type: "text", - label: "Out" + type: "number", + label: "End" }, nameofwork: { elem: "input", @@ -160,7 +160,7 @@ nameofworkurl: { elem: "input", type: "url", - label: "Url of Work", + label: "URL of Work", optional: true }, copyrightholder: { @@ -171,17 +171,17 @@ copyrightholderurl: { elem: "input", type: "url", - label: "Copyright Holder Url", + label: "Copyright Holder URL", optional: true }, license: { elem: "input", type: "text", - label: "License type" + label: "License Type" }, licenseurl: { elem: "input", - type: "url", + type: "text", label: "License URL", optional: true }, diff --git a/plugins/code/popcorn.code.js b/plugins/code/popcorn.code.js index e0273c66..199b6c62 100755 --- a/plugins/code/popcorn.code.js +++ b/plugins/code/popcorn.code.js @@ -155,13 +155,13 @@ options: { start: { elem: "input", - type: "text", - label: "In" + type: "number", + label: "Start" }, end: { elem: "input", - type: "text", - label: "Out" + type: "number", + label: "End" }, onStart: { elem: "input", diff --git a/plugins/documentcloud/popcorn.documentcloud.js b/plugins/documentcloud/popcorn.documentcloud.js index a42e0751..34d83946 100644 --- a/plugins/documentcloud/popcorn.documentcloud.js +++ b/plugins/documentcloud/popcorn.documentcloud.js @@ -39,13 +39,13 @@ api - https://github.com/documentcloud/document-viewer/blob/master/public/javasc options: { start: { elem: "input", - type: "text", - label: "In" + type: "number", + label: "Start" }, end: { elem: "input", - type: "text", - label: "Out" + type: "number", + label: "End" }, target: "documentcloud-container", width: { @@ -62,7 +62,7 @@ api - https://github.com/documentcloud/document-viewer/blob/master/public/javasc }, src: { elem: "input", - type: "text", + type: "url", label: "PDF URL", "default": "http://www.documentcloud.org/documents/70050-urbina-day-1-in-progress.html" }, diff --git a/plugins/facebook/popcorn.facebook.js b/plugins/facebook/popcorn.facebook.js index 14b7e2d9..919b94ad 100755 --- a/plugins/facebook/popcorn.facebook.js +++ b/plugins/facebook/popcorn.facebook.js @@ -60,24 +60,24 @@ type: { elem: "select", options: [ "LIKE", "LIKE-BOX", "ACTIVITY", "FACEPILE", "LIVE-STREAM", "SEND", "COMMENTS" ], - label: "Type" + label: "Plugin Type" }, target: "facebook-container", start: { elem: "input", - type: "text", - label: "In" + type: "number", + label: "Start" }, end: { elem: "input", - type: "text", - label: "Out" + type: "number", + label: "End" }, // optional parameters: font: { elem: "input", type: "text", - label: "font", + label: "Font", optional: true }, xid: { @@ -89,13 +89,13 @@ href: { elem: "input", type: "url", - label: "Href", + label: "href", optional: true }, site: { elem: "input", type: "url", - label:"Site", + label: "Site", optional: true }, height: { @@ -141,32 +141,32 @@ max_rows: { elem: "input", type: "number", - label: "Max_rows", + label: "Max Rows", "default": 1, optional: true }, border_color: { elem: "input", type: "text", - label: "Border_color", + label: "Border Color", optional: true }, event_app_id: { elem: "input", type: "text", - label: "Event_app_id", + label: "Event App Id", optional: true }, colorscheme: { elem: "select", options: [ "light", "dark" ], - label: "Colorscheme", + label: "Color Scheme", optional: true }, show_faces: { elem: "input", type: "checkbox", - label: "Showfaces", + label: "Show Faces", "default": false, optional: true }, @@ -180,14 +180,14 @@ always_post_to_friends: { elem: "input", type: "checkbox", - label: "Always_post_to_friends", + label: "Always post to Friends", "default": false, optional: true }, num_posts: { elem: "input", type: "number", - label: "Number_of_Comments", + label: "Number of Comments", "default": 1, optional: true } diff --git a/plugins/flickr/popcorn.flickr.js b/plugins/flickr/popcorn.flickr.js index 6d3f2480..f075190e 100755 --- a/plugins/flickr/popcorn.flickr.js +++ b/plugins/flickr/popcorn.flickr.js @@ -176,18 +176,18 @@ options: { start: { elem: "input", - type: "text", - label: "In" + type: "number", + label: "Start" }, end: { elem: "input", - type: "text", - label: "Out" + type: "number", + label: "End" }, userid: { elem: "input", type: "text", - label: "UserID", + label: "User ID", optional: true }, tags: { @@ -204,7 +204,7 @@ apikey: { elem: "input", type: "text", - label: "Api_key", + label: "API Key", optional: true }, target: "flickr-container", diff --git a/plugins/footnote/popcorn.footnote.js b/plugins/footnote/popcorn.footnote.js index cb35ca3c..189b5769 100755 --- a/plugins/footnote/popcorn.footnote.js +++ b/plugins/footnote/popcorn.footnote.js @@ -36,13 +36,13 @@ options: { start: { elem: "input", - type: "text", - label: "In" + type: "number", + label: "Start" }, end: { elem: "input", - type: "text", - label: "Out" + type: "number", + label: "End" }, text: { elem: "input", diff --git a/plugins/gml/popcorn.gml.js b/plugins/gml/popcorn.gml.js index 368daadc..a0a1e851 100755 --- a/plugins/gml/popcorn.gml.js +++ b/plugins/gml/popcorn.gml.js @@ -153,18 +153,18 @@ options: { start: { elem: "input", - type: "text", - label: "In" + type: "number", + label: "Start" }, end: { elem: "input", - type: "text", - label: "Out" + type: "number", + label: "End" }, gmltag: { elem: "input", type: "text", - label: "GMLTag" + label: "GML Tag" }, target: "gml-container" } diff --git a/plugins/googlefeed/popcorn.googlefeed.js b/plugins/googlefeed/popcorn.googlefeed.js index 72fc6edb..5b0436c1 100755 --- a/plugins/googlefeed/popcorn.googlefeed.js +++ b/plugins/googlefeed/popcorn.googlefeed.js @@ -155,32 +155,32 @@ options: { start: { elem: "input", - type: "text", - label: "In" + type: "number", + label: "Start" }, end: { elem: "input", - type: "text", - label: "Out" + type: "number", + label: "End" }, target: "feed-container", url: { elem: "input", type: "url", - label: "url", + label: "Feed URL", "default": "http://planet.mozilla.org/rss20.xml" }, title: { elem: "input", type: "text", - label: "title", + label: "Title", "default": "Planet Mozilla", optional: true }, orientation: { elem: "select", options: [ "Vertical", "Horizontal" ], - label: "orientation", + label: "Orientation", "default": "Vertical", optional: true } diff --git a/plugins/googlemap/popcorn.googlemap.js b/plugins/googlemap/popcorn.googlemap.js index ef1f1a31..72b24567 100755 --- a/plugins/googlemap/popcorn.googlemap.js +++ b/plugins/googlemap/popcorn.googlemap.js @@ -395,19 +395,19 @@ var googleCallback; options: { start: { elem: "input", - type: "text", - label: "In" + type: "start", + label: "Start" }, end: { elem: "input", - type: "text", - label: "Out" + type: "start", + label: "End" }, target: "map-container", type: { elem: "select", options: [ "ROADMAP", "SATELLITE", "STREETVIEW", "HYBRID", "TERRAIN", "STAMEN-WATERCOLOR", "STAMEN-TERRAIN", "STAMEN-TONER" ], - label: "Type", + label: "Map Type", optional: true }, zoom: { diff --git a/plugins/image/popcorn.image.js b/plugins/image/popcorn.image.js index 8e889761..28b0688d 100755 --- a/plugins/image/popcorn.image.js +++ b/plugins/image/popcorn.image.js @@ -92,31 +92,32 @@ start: { elem: "input", type: "number", - label: "In" + label: "Start" }, end: { elem: "input", type: "number", - label: "Out" + label: "End" + }, + src: { + elem: "input", + type: "url", + label: "Image URL", + "default": "http://mozillapopcorn.org/wp-content/themes/popcorn/images/for_developers.png" }, href: { elem: "input", type: "url", - label: "anchor URL", + label: "Link", "default": "http://mozillapopcorn.org/wp-content/themes/popcorn/images/for_developers.png", optional: true }, target: "image-container", - src: { - elem: "input", - type: "url", - label: "Source URL", - "default": "http://mozillapopcorn.org/wp-content/themes/popcorn/images/for_developers.png" - }, text: { elem: "input", type: "text", - label: "Text", + label: "Caption", + "default": "Popcorn.js", optional: true } } diff --git a/plugins/lastfm/popcorn.lastfm.js b/plugins/lastfm/popcorn.lastfm.js index b01fc6d8..2a1900f6 100755 --- a/plugins/lastfm/popcorn.lastfm.js +++ b/plugins/lastfm/popcorn.lastfm.js @@ -119,13 +119,13 @@ options: { start: { elem: "input", - type: "text", - label: "In" + type: "number", + label: "Start" }, end: { elem: "input", - type: "text", - label: "Out" + type: "number", + label: "End" }, target: "lastfm-container", artist: { diff --git a/plugins/linkedin/popcorn.linkedin.js b/plugins/linkedin/popcorn.linkedin.js index ae032a33..4b101a62 100755 --- a/plugins/linkedin/popcorn.linkedin.js +++ b/plugins/linkedin/popcorn.linkedin.js @@ -54,7 +54,7 @@ }, url: { elem: "input", - type: "text", + type: "url", label: "URL" }, apikey: { @@ -94,24 +94,24 @@ productid: { elem: "input", type: "text", - label: "productid", + label: "Product Id", optional: true }, related: { elem: "input", type: "text", - label: "related", + label: "Related", optional: true }, start: { elem: "input", - type: "text", - label: "In" + type: "number", + label: "Start" }, end: { elem: "input", - type: "text", - label: "Out" + type: "number", + label: "End" }, target: "linkedin-container" diff --git a/plugins/lowerthird/popcorn.lowerthird.js b/plugins/lowerthird/popcorn.lowerthird.js index a858285d..fcbb6495 100755 --- a/plugins/lowerthird/popcorn.lowerthird.js +++ b/plugins/lowerthird/popcorn.lowerthird.js @@ -41,32 +41,32 @@ options:{ start: { elem: "input", - type: "text", - label: "In" + type: "number", + label: "Start" }, end: { elem: "input", - type: "text", - label: "Out" + type: "number", + label: "End" }, target: "lowerthird-container", salutation : { elem: "input", type: "text", - label: "Text", + label: "Salutation", "default": "hello", optional: true }, name: { elem: "input", type: "text", - label: "Text", + label: "Name", "default": "Popcorn.js" }, role: { elem: "input", type: "text", - label: "Text", + label: "Role", "default": "JavaScript library", optional: true } diff --git a/plugins/mediaspawner/popcorn.mediaspawner.js b/plugins/mediaspawner/popcorn.mediaspawner.js index 16aa715f..2bda70fb 100644 --- a/plugins/mediaspawner/popcorn.mediaspawner.js +++ b/plugins/mediaspawner/popcorn.mediaspawner.js @@ -64,12 +64,12 @@ target: "mediaspawner-container", start: { elem: "input", - type: "text", + type: "number", label: "Start" }, end: { elem: "input", - type: "text", + type: "number", label: "End" }, autoplay: { diff --git a/plugins/mustache/popcorn.mustache.js b/plugins/mustache/popcorn.mustache.js index 55d95326..2bb1b060 100755 --- a/plugins/mustache/popcorn.mustache.js +++ b/plugins/mustache/popcorn.mustache.js @@ -179,13 +179,13 @@ options: { start: { elem: "input", - type: "text", - label: "In" + type: "number", + label: "Start" }, end: { elem: "input", - type: "text", - label: "Out" + type: "number", + label: "End" }, target: "mustache-container", template: { diff --git a/plugins/openmap/popcorn.openmap.js b/plugins/openmap/popcorn.openmap.js index a2540476..cb79ceba 100755 --- a/plugins/openmap/popcorn.openmap.js +++ b/plugins/openmap/popcorn.openmap.js @@ -341,19 +341,19 @@ options:{ start: { elem: "input", - type: "text", - label: "In" + type: "number", + label: "Start" }, end: { elem: "input", - type: "text", - label: "Out" + type: "number", + label: "End" }, target: "map-container", type: { elem: "select", options: [ "ROADMAP", "SATELLITE", "TERRAIN" ], - label: "Type", + label: "Map Type", optional: true }, zoom: { diff --git a/plugins/processing/popcorn.processing.js b/plugins/processing/popcorn.processing.js index 12bc9fa6..033bc0c2 100644 --- a/plugins/processing/popcorn.processing.js +++ b/plugins/processing/popcorn.processing.js @@ -134,19 +134,15 @@ options: { start: { elem: "input", - type: "text", - label: "In" + type: "Number", + label: "Start" }, end: { elem: "input", - type: "text", - label: "Out" - }, - target: { - elem: "input", - type: "text", - label: "Target" + type: "Number", + label: "End" }, + target: "processing-container", sketch: { elem: "input", type: "url", diff --git a/plugins/rdio/popcorn.rdio.js b/plugins/rdio/popcorn.rdio.js index e4a7ccc9..946a79c4 100644 --- a/plugins/rdio/popcorn.rdio.js +++ b/plugins/rdio/popcorn.rdio.js @@ -131,15 +131,15 @@ options: { start: { elem: "input", - type: "text", - label: "In" + type: "number", + label: "Start" }, end: { elem: "input", - type: "text", - label: "Out" + type: "number", + label: "End" }, - target: "rdio", + target: "rdio-container", artist: { elem: "input", type: "text", diff --git a/plugins/subtitle/popcorn.subtitle.js b/plugins/subtitle/popcorn.subtitle.js index 060691f0..fba8d811 100755 --- a/plugins/subtitle/popcorn.subtitle.js +++ b/plugins/subtitle/popcorn.subtitle.js @@ -71,12 +71,12 @@ start: { elem: "input", type: "text", - label: "In" + label: "Start" }, end: { elem: "input", type: "text", - label: "Out" + label: "End" }, target: "subtitle-container", text: { diff --git a/plugins/tagthisperson/popcorn.tagthisperson.js b/plugins/tagthisperson/popcorn.tagthisperson.js index 00759e70..7bf1e901 100755 --- a/plugins/tagthisperson/popcorn.tagthisperson.js +++ b/plugins/tagthisperson/popcorn.tagthisperson.js @@ -106,31 +106,31 @@ options:{ start: { elem: "input", - type: "text", - label: "In" + type: "number", + label: "Start" }, end: { elem: "input", - type: "text", - label: "Out" + type: "number", + label: "End" }, target : "tagthisperson-container", person: { elem: "input", type: "text", - label: "Name", + label: "Person's Name", "default": "Popcorn.js" }, image: { elem: "input", type: "url", - label: "Image Src", + label: "Image URL", optional: true }, href: { elem: "input", type: "url", - label: "URL", + label: "Link", optional: true } } diff --git a/plugins/text/popcorn.text.js b/plugins/text/popcorn.text.js index b356c36e..a31e4c83 100755 --- a/plugins/text/popcorn.text.js +++ b/plugins/text/popcorn.text.js @@ -129,13 +129,13 @@ options: { start: { elem: "input", - type: "text", - label: "In" + type: "number", + label: "Start" }, end: { elem: "input", - type: "text", - label: "Out" + type: "number", + label: "End" }, text: { elem: "input", diff --git a/plugins/timeline/popcorn.timeline.js b/plugins/timeline/popcorn.timeline.js index 938ebd7f..d00895ea 100644 --- a/plugins/timeline/popcorn.timeline.js +++ b/plugins/timeline/popcorn.timeline.js @@ -109,35 +109,35 @@ options: { start: { elem: "input", - type: "text", - label: "In" + type: "number", + label: "Start" }, end: { elem: "input", - type: "text", - label: "Out" + type: "number", + label: "End" }, target: "feed-container", title: { elem: "input", type: "text", - label: "title" + label: "Title" }, text: { elem: "input", type: "text", - label: "text" + label: "Text" }, innerHTML: { elem: "input", type: "text", - label: "innerHTML", + label: "HTML Code", optional: true }, direction: { elem: "select", options: [ "DOWN", "UP" ], - label: "direction", + label: "Direction", optional: true } } diff --git a/plugins/tumblr/popcorn.tumblr.js b/plugins/tumblr/popcorn.tumblr.js index 25f2cc48..f7cc6d4d 100644 --- a/plugins/tumblr/popcorn.tumblr.js +++ b/plugins/tumblr/popcorn.tumblr.js @@ -76,7 +76,7 @@ } // Current means of handling if alt_sizes doesn't have our default image size - defaultSizeIndex === -1 && Popcorn.error( "Clearly your blog has a picture that is so tiny it isn't even 250px wide. Consider " + + defaultSizeIndex === -1 && Popcorn.error( "Clearly your blog has a picture that is so tiny it isn't even 250px wide. Consider " + " using a bigger picture or try a smaller size." ); // If a matching photo is never found, use the default size. @@ -247,42 +247,42 @@ requestType: { elem: "select", options:[ "INFO", "AVATAR", "BLOGPOST" ], - label: "Type_Of_Plugin" + label: "Request Type" }, target: "tumblr-container", start: { elem: "input", - type: "text", - label: "Start_Time" + type: "number", + label: "Start" }, end: { elem: "input", - type: "text", - label: "End_Time" + type: "number", + label: "End" }, base_hostname: { elem: "input", type: "text", - label: "User_Name", + label: "User Name", "default": "https://citriccomics.tumblr.com" }, // optional parameters: api_key: { // Required for Blog Info and Blog Post retrievals elem: "input", type: "text", - label: "Application_Key", + label: "API key", optional: true }, size: { elem: "select", options: [ 16, 24, 30, 40, 48, 64, 96, 128, 512 ], - label: "avatarSize", + label: "Avatar Size", optional: true }, blogId: { // Required for BLOGPOST requests elem: "input", type: "number", - label: "Blog_ID", + label: "Blog Id", optional: true }, /* Optional for Photo and Video BlogPosts, defaulted to 250 pixels for photos and 400 for videos if not provided or provided width @@ -291,8 +291,8 @@ */ width: { elem: "input", - type: "number", - label: "Photo_Width", + type: "text", + label: "Photo Width", optional: true } } @@ -350,9 +350,9 @@ } else { type = "info"; } - requestString = "http://api.tumblr.com/v2/blog/" + options.base_hostname + "/" + type + "?api_key=" + options.api_key + "&id=" + options.blogId + + requestString = "http://api.tumblr.com/v2/blog/" + options.base_hostname + "/" + type + "?api_key=" + options.api_key + "&id=" + options.blogId + "&jsonp=tumblrCallBack"; - + this.listen( "tumblrError", function( e ){ Popcorn.error( e ); }); diff --git a/plugins/twitter/popcorn.twitter.js b/plugins/twitter/popcorn.twitter.js index 1afea2d5..d349990e 100755 --- a/plugins/twitter/popcorn.twitter.js +++ b/plugins/twitter/popcorn.twitter.js @@ -43,18 +43,18 @@ options:{ start: { elem: "input", - type: "text", - label: "In" + type: "number", + label: "Start" }, end: { elem: "input", - type: "text", - label: "Out" + type: "number", + label: "End" }, src: { elem: "input", type: "text", - label: "Source", + label: "Tweet Source (# or @)", "default": "@popcornjs" }, target: "twitter-container", diff --git a/plugins/webpage/popcorn.webpage.js b/plugins/webpage/popcorn.webpage.js index 62e04dea..583e2434 100755 --- a/plugins/webpage/popcorn.webpage.js +++ b/plugins/webpage/popcorn.webpage.js @@ -43,18 +43,18 @@ }, start: { elem: "input", - type: "text", - label: "In" + type: "number", + label: "Start" }, end: { elem: "input", - type: "text", - label: "Out" + type: "number", + label: "End" }, src: { elem: "input", type: "url", - label: "Src", + label: "Webpage URL", "default": "http://mozillapopcorn.org" }, target: "iframe-container" diff --git a/plugins/wikipedia/popcorn.wikipedia.js b/plugins/wikipedia/popcorn.wikipedia.js index b3f33984..f6c9eff5 100755 --- a/plugins/wikipedia/popcorn.wikipedia.js +++ b/plugins/wikipedia/popcorn.wikipedia.js @@ -43,13 +43,13 @@ var wikiCallback; options:{ start: { elem: "input", - type: "text", - label: "In" + type: "number", + label: "Start" }, end: { elem: "input", - type: "text", - label: "Out" + type: "number", + label: "End" }, lang: { elem: "input", @@ -61,7 +61,7 @@ var wikiCallback; src: { elem: "input", type: "url", - label: "Src", + label: "Wikipedia URL", "default": "http://en.wikipedia.org/wiki/Cat" }, title: { @@ -73,8 +73,8 @@ var wikiCallback; }, numberofwords: { elem: "input", - type: "text", - label: "Num Of Words", + type: "number", + label: "Number of Words", "default": "200", optional: true }, diff --git a/plugins/wordriver/popcorn.wordriver.js b/plugins/wordriver/popcorn.wordriver.js index 874c5785..8c930373 100755 --- a/plugins/wordriver/popcorn.wordriver.js +++ b/plugins/wordriver/popcorn.wordriver.js @@ -71,13 +71,13 @@ options: { start: { elem: "input", - type: "text", - label: "In" + type: "number", + label: "Start" }, end: { elem: "input", - type: "text", - label: "Out" + type: "number", + label: "End" }, target: "wordriver-container", text: {