Permalink
Browse files

Merge Popcorn.js v0.9 into master

  • Loading branch information...
cadecairos committed Oct 5, 2011
2 parents 57ceac8 + aae4e9f commit ce66d472ce3a76685ae47f35feac52b173f47d02
Showing with 5,329 additions and 3,904 deletions.
  1. +4 −3 .gitmodules
  2. +2 −0 AUTHORS
  3. +68 −36 Makefile
  4. +4 −2 build/jslint-check.js
  5. +0 −86 demos/popcorn/index.html
  6. +0 −95 demos/popcorn/style.css
  7. BIN demos/popcorn/team.jpg
  8. +0 −76 demos/popcorn/xml/data.xml
  9. +4 −0 effects/applyclass/popcorn.applyclass.html
  10. +1 −0 modules/sequence
  11. +64 −0 modules/timeline-sources/popcorn.timeline-sources.js
  12. +43 −0 modules/timeline-sources/popcorn.timeline-sources.unit.html
  13. +79 −0 modules/timeline-sources/popcorn.timeline-sources.unit.js
  14. +18 −13 parsers/parserJSON/popcorn.parserJSON.unit.html
  15. +15 −6 parsers/parserJSON/popcorn.parserJSON.unit.js
  16. +4 −0 parsers/parserSBV/popcorn.parserSBV.unit.html
  17. +4 −0 parsers/parserSRT/popcorn.parserSRT.unit.html
  18. +4 −0 parsers/parserSSA/popcorn.parserSSA.unit.html
  19. +4 −0 parsers/parserTTML/popcorn.parserTTML.unit.html
  20. +4 −0 parsers/parserTTXT/popcorn.parserTTXT.unit.html
  21. +4 −0 parsers/parserVTT/popcorn.parserVTT.unit.html
  22. +4 −0 parsers/parserXML/popcorn.parserXML.unit.html
  23. +2 −1 parsers/parserXML/popcorn.parserXML.unit.js
  24. +4 −0 players/baseplayer/popcorn.baseplayer.unit.html
  25. +0 −1 players/sequence
  26. +8 −7 players/youtube/popcorn.youtube.html
  27. +164 −502 players/youtube/popcorn.youtube.js
  28. +317 −176 players/youtube/popcorn.youtube.unit.js
  29. +23 −25 plugins/attribution/popcorn.attribution.html
  30. +63 −31 plugins/attribution/popcorn.attribution.js
  31. +19 −15 plugins/attribution/popcorn.attribution.unit.html
  32. +37 −38 plugins/attribution/popcorn.attribution.unit.js
  33. +14 −14 plugins/code/popcorn.code.html
  34. +50 −32 plugins/code/popcorn.code.js
  35. +8 −4 plugins/code/popcorn.code.unit.html
  36. +20 −20 plugins/code/popcorn.code.unit.js
  37. +48 −47 plugins/facebook/popcorn.facebook.html
  38. +158 −118 plugins/facebook/popcorn.facebook.js
  39. +17 −16 plugins/facebook/popcorn.facebook.unit.html
  40. +113 −57 plugins/facebook/popcorn.facebook.unit.js
  41. +7 −7 plugins/flickr/popcorn.flickr.html
  42. +7 −2 plugins/flickr/popcorn.flickr.js
  43. +19 −15 plugins/flickr/popcorn.flickr.unit.html
  44. +18 −18 plugins/flickr/popcorn.flickr.unit.js
  45. +23 −23 plugins/footnote/popcorn.footnote.html
  46. +26 −14 plugins/footnote/popcorn.footnote.js
  47. +9 −5 plugins/footnote/popcorn.footnote.unit.html
  48. +28 −27 plugins/footnote/popcorn.footnote.unit.js
  49. +27 −29 plugins/gml/popcorn.gml.html
  50. +29 −37 plugins/gml/popcorn.gml.js
  51. +18 −16 plugins/gml/popcorn.gml.unit.html
  52. +30 −30 plugins/gml/popcorn.gml.unit.js
  53. +20 −16 plugins/googlefeed/popcorn.googlefeed.html
  54. +25 −25 plugins/googlefeed/popcorn.googlefeed.js
  55. +19 −15 plugins/googlefeed/popcorn.googlefeed.unit.html
  56. +32 −32 plugins/googlefeed/popcorn.googlefeed.unit.js
  57. +80 −45 plugins/googlemap/popcorn.googlemap.html
  58. +41 −43 plugins/googlemap/popcorn.googlemap.js
  59. +20 −16 plugins/googlemap/popcorn.googlemap.unit.html
  60. +38 −39 plugins/googlemap/popcorn.googlemap.unit.js
  61. +8 −9 plugins/image/popcorn.image.html
  62. +20 −20 plugins/image/popcorn.image.js
  63. +14 −12 plugins/image/popcorn.image.unit.html
  64. +16 −16 plugins/image/popcorn.image.unit.js
  65. +47 −47 plugins/lastfm/popcorn.lastfm.html
  66. +50 −38 plugins/lastfm/popcorn.lastfm.js
  67. +19 −15 plugins/lastfm/popcorn.lastfm.unit.html
  68. +37 −37 plugins/lastfm/popcorn.lastfm.unit.js
  69. +15 −16 plugins/linkedin/popcorn.linkedin.html
  70. +27 −27 plugins/linkedin/popcorn.linkedin.js
  71. +18 −15 plugins/linkedin/popcorn.linkedin.unit.html
  72. +45 −45 plugins/linkedin/popcorn.linkedin.unit.js
  73. +18 −20 plugins/lowerthird/popcorn.lowerthird.html
  74. +38 −19 plugins/lowerthird/popcorn.lowerthird.js
  75. +18 −14 plugins/lowerthird/popcorn.lowerthird.unit.html
  76. +27 −27 plugins/lowerthird/popcorn.lowerthird.unit.js
  77. +43 −23 plugins/mustache/popcorn.mustache.js
  78. +8 −4 plugins/mustache/popcorn.mustache.unit.html
  79. +42 −41 plugins/mustache/popcorn.mustache.unit.js
  80. +22 −22 plugins/openmap/popcorn.openmap.html
  81. +73 −41 plugins/openmap/popcorn.openmap.js
  82. +18 −16 plugins/openmap/popcorn.openmap.unit.html
  83. +46 −46 plugins/openmap/popcorn.openmap.unit.js
  84. +9 −7 plugins/pause/popcorn.pause.html
  85. +11 −7 plugins/pause/popcorn.pause.unit.html
  86. +53 −48 plugins/pause/popcorn.pause.unit.js
  87. +7 −7 plugins/processing/popcorn.processing.html
  88. +80 −69 plugins/processing/popcorn.processing.js
  89. +11 −7 plugins/processing/popcorn.processing.unit.html
  90. +19 −19 plugins/processing/popcorn.processing.unit.js
  91. +20 −24 plugins/subtitle/popcorn.subtitle.html
  92. +18 −18 plugins/subtitle/popcorn.subtitle.js
  93. +26 −24 plugins/subtitle/popcorn.subtitle.unit.html
  94. +38 −40 plugins/subtitle/popcorn.subtitle.unit.js
  95. +30 −30 plugins/tagthisperson/popcorn.tagthisperson.html
  96. +44 −24 plugins/tagthisperson/popcorn.tagthisperson.js
  97. +21 −17 plugins/tagthisperson/popcorn.tagthisperson.unit.html
  98. +35 −35 plugins/tagthisperson/popcorn.tagthisperson.unit.js
  99. +18 −18 plugins/timeline/popcorn.timeline.html
  100. +18 −18 plugins/timeline/popcorn.timeline.js
  101. +18 −14 plugins/timeline/popcorn.timeline.unit.html
  102. +54 −48 plugins/timeline/popcorn.timeline.unit.js
  103. +23 −26 plugins/twitter/popcorn.twitter.html
  104. +57 −34 plugins/twitter/popcorn.twitter.js
  105. +18 −16 plugins/twitter/popcorn.twitter.unit.html
  106. +24 −24 plugins/twitter/popcorn.twitter.unit.js
  107. +27 −27 plugins/webpage/popcorn.webpage.html
  108. +48 −32 plugins/webpage/popcorn.webpage.js
  109. +19 −15 plugins/webpage/popcorn.webpage.unit.html
  110. +1 −1 plugins/webpage/popcorn.webpage.unit.js
  111. +16 −17 plugins/wikipedia/popcorn.wikipedia.html
  112. +1 −1 plugins/wikipedia/popcorn.wikipedia.js
  113. +8 −4 plugins/wikipedia/popcorn.wikipedia.unit.html
  114. +16 −16 plugins/wikipedia/popcorn.wikipedia.unit.js
  115. +19 −23 plugins/wordriver/popcorn.wordriver.html
  116. +31 −15 plugins/wordriver/popcorn.wordriver.js
  117. +18 −16 plugins/wordriver/popcorn.wordriver.unit.html
  118. +36 −37 plugins/wordriver/popcorn.wordriver.unit.js
  119. +562 −213 popcorn.js
  120. +110 −0 test/archaic.html
  121. +3 −0 test/data/testfunction.js
  122. +6 −14 test/index.html
  123. +65 −0 test/popcorn.unit.archaic.js
  124. +3 −0 test/popcorn.unit.archaic.setup.js
  125. +1,019 −313 test/popcorn.unit.js
  126. +13 −65 test/popcorn.unit.setup.js
  127. +76 −76 test/ready.html
View
@@ -1,3 +1,4 @@
-[submodule "players/sequence"]
- path = players/sequence
- url = git://github.com/rwldrn/popcorn.sequence.git
+
+[submodule "modules/sequence"]
+ path = modules/sequence
+ url = https://github.com/rwldrn/popcorn.sequence.git
View
@@ -19,3 +19,5 @@ Cole Gillespie
Nick Doiron
Bobby Richter
Jon Buckley
+Mathew Schranz
+Brian Chirls
View
104 Makefile
@@ -6,6 +6,7 @@ PLUGINS_DIR = ${PREFIX}/plugins
PARSERS_DIR = ${PREFIX}/parsers
PLAYERS_DIR = ${PREFIX}/players
EFFECTS_DIR = $(PREFIX)/effects
+MODULES_DIR = $(PREFIX)/modules
# Version number used in naming release files. Defaults to git commit sha.
VERSION ?= $(shell git show -s --pretty=format:%h)
@@ -27,6 +28,10 @@ POPCORN_SRC = ${PREFIX}/popcorn.js
POPCORN_DIST = ${DIST_DIR}/popcorn.js
POPCORN_MIN = ${DIST_DIR}/popcorn.min.js
+# modules
+MODULES_DIST = ${DIST_DIR}/popcorn.modules.js
+MODULES_MIN = ${DIST_DIR}/popcorn.modules.min.js
+
# plugins
PLUGINS_DIST = ${DIST_DIR}/popcorn.plugins.js
PLUGINS_MIN = ${DIST_DIR}/popcorn.plugins.min.js
@@ -52,32 +57,44 @@ PARSERS_SRC := $(filter-out %unit.js, $(shell find ${PARSERS_DIR} -name 'popcorn
# Grab all popcorn.<player-name>.js files from players dir
PLAYERS_SRC := $(filter-out %unit.js, $(shell find ${PLAYERS_DIR} -name 'popcorn.*.js' -print))
-# Grab all popcorn.<effect-name>.js files from players dir
+# Grab all popcorn.<effect-name>.js files from effects dir
EFFECTS_SRC := $(filter-out %unit.js, $(shell find $(EFFECTS_DIR) -name 'popcorn.*.js' -print))
-# Grab all popcorn.<player-name>.unit.js files from plugins dir
+# Grab all popcorn.<Module-name>.js files from modules dir
+MODULES_SRC := $(filter-out %unit.js, $(shell find $(MODULES_DIR) -name 'popcorn.*.js' -print))
+
+# Grab all popcorn.<plugin-name>.unit.js files from plugins dir
PLUGINS_UNIT := $(shell find ${PLUGINS_DIR} -name 'popcorn.*.unit.js' -print)
-# Grab all popcorn.<player-name>.unit.js files from parsers dir
+# Grab all popcorn.<parser-name>.unit.js files from parsers dir
PARSERS_UNIT := $(shell find ${PARSERS_DIR} -name 'popcorn.*.unit.js' -print)
# Grab all popcorn.<player-name>.unit.js files from players dir
PLAYERS_UNIT := $(shell find ${PLAYERS_DIR} -name 'popcorn.*.unit.js' -print)
-# Grab all popcorn.<effects>.unit.js files from players dir
+# Grab all popcorn.<effects>.unit.js files from effects dir
EFFECTS_UNIT := $(shell find $(EFFECTS_DIR) -name 'popcorn.*.unit.js' -print)
+# Grab all popcorn.<module-name>.unit.js files from modules dir
+MODULES_UNIT := $(shell find $(MODULES_DIR) -name 'popcorn.*.unit.js' -print)
+
# popcorn + plugins
POPCORN_COMPLETE_LIST := --js ${POPCORN_SRC} \
+ $(shell for js in ${MODULES_SRC} ; do echo --js $$js ; done) \
$(shell for js in ${PLUGINS_SRC} ; do echo --js $$js ; done) \
$(shell for js in ${PARSERS_SRC} ; do echo --js $$js ; done) \
$(shell for js in ${PLAYERS_SRC} ; do echo --js $$js ; done)
POPCORN_COMPLETE_DIST = ${DIST_DIR}/popcorn-complete.js
POPCORN_COMPLETE_MIN = ${DIST_DIR}/popcorn-complete.min.js
-# Create a versioned license header for js files we ship: arg1=source arg2=dest
-add_license = cat ${PREFIX}/LICENSE_HEADER | sed -e 's/@VERSION/${VERSION}/' > $(2) ; \
- cat $(1) >> $(2)
+# Create a versioned license header for js files we ship
+add_license = cat $(PREFIX)/LICENSE_HEADER | sed -e 's/@VERSION/${VERSION}/' > $(1).__hdr__ ; \
+ cat $(1).__hdr__ $(1) >> $(1).__tmp__ ; rm -f $(1).__hdr__ ; \
+ mv $(1).__tmp__ $(1)
+
+# Create a version parameter for Popcorn
+add_version = cat $(1) | sed -e 's/@VERSION/${VERSION}/' > $(1).__tmp__ ; \
+ mv $(1).__tmp__ $(1)
# Run the file through jslint
run_lint = @@$(RHINO) build/jslint-check.js $(1)
@@ -92,23 +109,35 @@ ${DIST_DIR}:
popcorn: ${POPCORN_DIST}
-${POPCORN_DIST}: ${POPCORN_SRC} | ${DIST_DIR}
- @@echo "Building" ${POPCORN_DIST}
- @@$(call add_license, $(POPCORN_SRC), $(POPCORN_DIST))
+${POPCORN_DIST}: $(POPCORN_SRC) | $(DIST_DIR)
+ @@echo "Building" $(POPCORN_DIST)
+ @@cp $(POPCORN_SRC) $(POPCORN_DIST)
+ @@$(call add_license, $(POPCORN_DIST))
+ @@$(call add_version, $(POPCORN_DIST))
-min: ${POPCORN_MIN} ${PLUGINS_MIN} ${PARSERS_MIN} ${PLAYERS_MIN} $(EFFECTS_MIN) ${POPCORN_COMPLETE_MIN}
+min: setup ${POPCORN_MIN} ${MODULES_MIN} ${PLUGINS_MIN} ${PARSERS_MIN} ${PLAYERS_MIN} $(EFFECTS_MIN) ${POPCORN_COMPLETE_MIN}
${POPCORN_MIN}: ${POPCORN_DIST}
@@echo "Building" ${POPCORN_MIN}
- @@$(call compile, --js ${POPCORN_DIST}, ${POPCORN_MIN}.tmp)
- @@$(call add_license, ${POPCORN_MIN}.tmp, ${POPCORN_MIN})
- @@rm ${POPCORN_MIN}.tmp
+ @@$(call compile, --js $(POPCORN_DIST), $(POPCORN_MIN))
+ @@$(call add_license, $(POPCORN_MIN))
+ @@$(call add_version, $(POPCORN_MIN))
-${POPCORN_COMPLETE_MIN}: update ${POPCORN_SRC} ${PLUGINS_SRC} ${PARSERS_SRC} $(EFFECTS_SRC) ${DIST_DIR}
+${POPCORN_COMPLETE_MIN}: ${POPCORN_SRC} ${MODULES_SRC} ${PLUGINS_SRC} ${PARSERS_SRC} $(EFFECTS_SRC) ${DIST_DIR}
@@echo "Building" ${POPCORN_COMPLETE_MIN}
- @@$(call compile, ${POPCORN_COMPLETE_LIST}, ${POPCORN_COMPLETE_MIN}.tmp)
- @@$(call add_license, ${POPCORN_COMPLETE_MIN}.tmp, ${POPCORN_COMPLETE_MIN})
- @@rm ${POPCORN_COMPLETE_MIN}.tmp
+ @@$(call compile, $(POPCORN_COMPLETE_LIST), $(POPCORN_COMPLETE_MIN))
+ @@$(call add_license, $(POPCORN_COMPLETE_MIN))
+ @@$(call add_version, $(POPCORN_COMPLETE_MIN))
+
+modules: setup ${MODULES_DIST}
+
+${MODULES_MIN}: ${MODULES_DIST}
+ @@echo "Building" ${MODULES_MIN}
+ @@$(call compile, $(shell for js in ${MODULES_SRC} ; do echo --js $$js ; done), ${MODULES_MIN})
+
+${MODULES_DIST}: ${MODULES_SRC} ${DIST_DIR}
+ @@echo "Building ${MODULES_DIST}"
+ @@cat ${MODULES_SRC} > ${MODULES_DIST}
plugins: ${PLUGINS_DIST}
@@ -150,16 +179,24 @@ $(EFFECTS_DIST): $(EFFECTS_SRC) $(DIST_DIR)
@@echo "Building $(EFFECTS_DIST)"
@@cat $(EFFECTS_SRC) > $(EFFECTS_DIST)
-complete: update ${POPCORN_SRC} ${PARSERS_SRC} ${PLUGINS_SRC} ${PLAYERS_SRC} $(EFFECTS_SRC) ${DIST_DIR}
- @@echo "Building popcorn + plugins + parsers + players + effects..."
- @@cat ${POPCORN_SRC} ${PLUGINS_SRC} ${PARSERS_SRC} ${PLAYERS_SRC} $(EFFECTS_SRC) > ${POPCORN_COMPLETE_DIST}.tmp
- @@$(call add_license, ${POPCORN_COMPLETE_DIST}.tmp, ${POPCORN_COMPLETE_DIST})
- @@rm ${POPCORN_COMPLETE_DIST}.tmp
+complete: setup ${POPCORN_SRC} ${MODULES_SRC} ${PARSERS_SRC} ${PLUGINS_SRC} ${PLAYERS_SRC} $(EFFECTS_SRC) ${DIST_DIR}
+ @@echo "Building popcorn + modules + plugins + parsers + players + effects..."
+ @@cat ${POPCORN_SRC} ${MODULES_SRC} ${PLUGINS_SRC} ${PARSERS_SRC} ${PLAYERS_SRC} $(EFFECTS_SRC) > $(POPCORN_COMPLETE_DIST)
+ @@$(call add_license, $(POPCORN_COMPLETE_DIST))
+ @@$(call add_version, $(POPCORN_COMPLETE_DIST))
lint:
@@echo "Checking Popcorn against JSLint..."
@@$(call run_lint,popcorn.js)
+lint-core-tests:
+ @@echo "Checking core unit tests against JSLint..."
+ @@$(call run_lint,test/popcorn.unit.js)
+
+lint-modules:
+ @@echo "Checking all modules against JSLint..."
+ @@$(call run_lint,$(MODULES_SRC))
+
lint-plugins:
@@echo "Checking all plugins against JSLint..."
@@$(call run_lint,$(PLUGINS_SRC))
@@ -176,6 +213,10 @@ lint-effects:
@@echo "Checking all effects against JSLint..."
@@$(call run_lint,$(EFFECTS_SRC))
+lint-modules-tests:
+ @@echo "Checking modules unit tests against JSLint..."
+ @@$(call run_lint,$(MODULES_UNIT))
+
lint-plugin-tests:
@@echo "Checking plugin unit tests against JSLint..."
@@$(call run_lint,$(PLUGINS_UNIT))
@@ -192,7 +233,7 @@ lint-player-tests:
@@echo "Checking player unit tests against JSLint..."
@@$(call run_lint,$(PLAYERS_UNIT))
-lint-unit-tests: lint-plugin-tests lint-parser-tests lint-player-tests lint-effects-tests
+lint-unit-tests: lint-modules-tests lint-plugin-tests lint-parser-tests lint-player-tests lint-effects-tests
@@echo "completed"
# Create a mirror copy of the tree in dist/ using popcorn-complete.js
@@ -212,6 +253,7 @@ testing: complete
@@rm -fr ${TESTING_MIRROR}/AUTHORS ${TESTING_MIRROR}/LICENSE ${TESTING_MIRROR}/LICENSE_HEADER \
${TESTING_MIRROR}/Makefile ${TESTING_MIRROR}/readme.md
@@touch "${TESTING_MIRROR}/THIS IS A TESTING MIRROR -- READ-ONLY"
+ $(call overwrite_js, ${TESTING_MIRROR}/modules)
$(call overwrite_js, ${TESTING_MIRROR}/plugins)
$(call overwrite_js, ${TESTING_MIRROR}/players)
$(call overwrite_js, ${TESTING_MIRROR}/parsers)
@@ -222,16 +264,6 @@ clean:
@@echo "Removing Distribution directory:" ${DIST_DIR}
@@rm -rf ${DIST_DIR}
-# Setup any git submodules we need
-SEQUENCE_SRC = ${PLAYERS_DIR}/sequence/popcorn.sequence.js
-
-setup: ${SEQUENCE_SRC} update
-
-update:
+setup:
@@echo "Updating submodules..."
- @@git submodule update
- @@cd players/sequence; git pull origin master
-
-${SEQUENCE_SRC}:
- @@echo "Setting-up submodules..."
- @@git submodule init
+ @@git submodule update --init
View
@@ -9,7 +9,9 @@ var ok = {
"Use '!==' to compare with 'null'.": true,
"Expected an assignment or function call and instead saw an expression.": true,
"Expected a 'break' statement before 'case'.": true,
- "'e' is already defined.": true
+ "'e' is already defined.": true,
+ "Don't make functions within a loop.": true,
+ "['out'] is better written in dot notation.": true
};
function check(src)
@@ -26,7 +28,7 @@ function check(src)
print( " Problem at line " + w.line + " character " + w.character + ": " + w.reason );
}
}
-
+
if ( found > 0 ) {
print( "\n" + found + " Error(s) found." );
} else {
View
@@ -1,86 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
- <script src="../../popcorn.js"></script>
- <link href="style.css" rel="stylesheet" type="text/css" />
-
- <!-- This is needed for google maps api -->
- <script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=false"></script>
- <!-- These two are needed for google news api -->
- <script src="http://google.com/jsapi"></script>
- <script>google.load("elements", "1", {packages : ["newsshow"]});</script>
- <!-- This is needed for language translation -->
- <script>google.load("language", "1");</script>
-</head>
-<body>
- <!-- Start Contents -->
- <div id="contents">
- <!-- Start Left Contents -->
- <div class="left-content">
- <!-- Start Video Div -->
- <br />
- <div id="videoContainer" class="video-div">
- <video src="http://scotland.proximity.on.ca/sdowne/popcornIntroDemo/demo.ogg" data-timeline-sources="xml/data.xml" style="-moz-transform: scaleX(1.2); height:300px;" controls></video>
- <div id="translateinfo"style="z-index:2;position:absolute;color:white;textShadow:black 2px 2px 6px;font-size:18px;font-family:arial;max-width:480px;font-weight:bold;top: 230px;left:-20px"></div>
- <div id="translateinfofrench" style="z-index:2;position:absolute;color:white;textShadow:black 2px 2px 6px;font-style:italic;font-family:arial;max-width:480px;font-size:18px;font-weight:bold;top:260px;left:-20px"></div>
- </div>
-
- <div class="video-info" style="display:none">
- <!-- Start Choose Language -->
- <div class="choose-language">
- <h2>Choose your language</h2>
- <select id="language">
- <option value="zh">Chinese</option>
- <option value="fr" selected="selected">French</option>
- <option value="de">German</option>
- <option value="it">Italian</option>
- <option value="ja">Japanese</option>
- <option value="ko">Korean</option>
- <option value="fa">Persian</option>
- <option value="pl">Polish</option>
- <option value="pt">Portuguese</option>
- <option value="es">Spanish</option>
- </select>
- <span id="credit">
- with help from
- <a href="http://google.com/translate">Google Translate</a> and <a href="http://jquery.com">
- jQuery</a>
- </span>
- </div>
- <!-- End Choose Language -->
- </div>
- <!-- End Video Info -->
- <div id="attribinfo" style="display:none;background:white;width:409px;height:100px;text-align:left;padding-left:4px;"></div>
- </div><br />
-
- </div><!-- End Video Div -->
- <div class="right-content">
- <h1>Google Maps</h1>
- <div id="mapinfo" style="width:400px;height:250px" ></div>
-
- <div id="imageinfo" style="display:none;top:330px;width:400px;text-align:left;"> <!--needed for imageCommand -->
- <h1>Popcorn-js Team</h1>
- </div>
-
- <div id="wikiinfo" style="display:none;top:330px;background:black;color:white;width:400px;height:220px;text-align:left;padding-left:4px;position:absolute;">
- <h1>Wikipedia</h1><br>
- </div>
- <div id="flickrinfo" style="display:none;top:330px;color:white;background:black;width:400px;height:220px;text-align:left;position:absolute">
- <h1>Flickr</h1>
- </div>
- <div id="twitterinfo" style="display:none;top:330px;color:white;background:white;width:400px;height:100px;text-align:left;align:left">
- <br />
- </div>
-
- </div>
- <br />
- <div class="full-content">
-
- <div id="iframeinfo"></div>
- <div id="iframeinfo"></div>
-
- </div>
- </div>
- </body>
-</html>
-
Oops, something went wrong.

0 comments on commit ce66d47

Please sign in to comment.