From 3a455373f1fe873faacac27176ff4d7438778f22 Mon Sep 17 00:00:00 2001 From: Zach Wise Date: Thu, 18 Apr 2013 13:36:02 -0500 Subject: [PATCH] Added the ability to use Vine videos --- codekit-config.json | 560 ++++++++++++++++++------------------- examples/example_json.json | 12 + source/js/Core | 2 +- tests/test_extra_html.json | 7 +- 4 files changed, 297 insertions(+), 284 deletions(-) diff --git a/codekit-config.json b/codekit-config.json index 87c3472..4ff71c0 100644 --- a/codekit-config.json +++ b/codekit-config.json @@ -1,6 +1,6 @@ { "CodeKitInfo" : "This is a CodeKit project configuration file. It is designed to sync project settings across multiple machines. Modifying the contents of this file can be a poor life decision if you don't know what you're doing. This file is not useful unless accompanied by the project that created it in CodeKit. For more information, see: http:\/\/incident57.com\/codekit", - "creatorBuild" : "8248", + "creatorBuild" : "8283", "files" : { "\/dev_examples\/archive\/index_backup.html" : { "ignoreWasSetByUser" : 0, @@ -192,25 +192,29 @@ "outputAbbreviatedPath" : "No Output Path", "fileType" : 2048 }, - "\/source\/jade\/sections\/example-head.jade" : { + "\/source\/less\/Core\/Font\/NewsCycle-Merriweather.less" : { "ignoreWasSetByUser" : 0, - "ignore" : 1, + "ignore" : 0, "hidden" : 0, - "outputPathIsSetByUser" : 0, - "inputAbbreviatedPath" : "\/source\/jade\/sections\/example-head.jade", - "outputStyle" : 0, - "compileDebug" : 1, - "outputAbbreviatedPath" : "\/source\/jade\/sections\/example-head.html", - "fileType" : 512 + "outputPathIsSetByUser" : 1, + "inputAbbreviatedPath" : "\/source\/less\/Core\/Font\/NewsCycle-Merriweather.less", + "outputStyle" : 1, + "shouldRunBless" : 0, + "outputAbbreviatedPath" : "\/compiled\/css\/themes\/font\/NewsCycle-Merriweather.css", + "strictImports" : 0, + "fileType" : 1, + "debugStyle" : 0 }, - "\/compiled\/css\/themes\/font\/Rancho-Gudea.css" : { + "\/source\/js\/Core\/Language\/locale\/pt-br.js" : { "ignoreWasSetByUser" : 0, "ignore" : 0, "hidden" : 0, - "outputPathIsSetByUser" : 0, - "inputAbbreviatedPath" : "\/compiled\/css\/themes\/font\/Rancho-Gudea.css", - "outputAbbreviatedPath" : "No Output Path", - "fileType" : 16 + "outputPathIsSetByUser" : 1, + "inputAbbreviatedPath" : "\/source\/js\/Core\/Language\/locale\/pt-br.js", + "outputStyle" : 1, + "syntaxCheckerStyle" : 0, + "outputAbbreviatedPath" : "\/compiled\/js\/locale\/pt-br.js", + "fileType" : 64 }, "\/source\/js\/Core\/Language\/locale\/bg.js" : { "ignoreWasSetByUser" : 0, @@ -223,6 +227,17 @@ "outputAbbreviatedPath" : "\/compiled\/js\/locale\/bg.js", "fileType" : 64 }, + "\/source\/js\/Core\/Media\/VMM.Media.js" : { + "ignoreWasSetByUser" : 0, + "ignore" : 1, + "hidden" : 0, + "outputPathIsSetByUser" : 0, + "inputAbbreviatedPath" : "\/source\/js\/Core\/Media\/VMM.Media.js", + "outputStyle" : 1, + "syntaxCheckerStyle" : 0, + "outputAbbreviatedPath" : "\/source\/js\/Core\/Media\/VMM.Media-min.js", + "fileType" : 64 + }, "\/source\/less\/Core\/VMM.Slider.less" : { "ignoreWasSetByUser" : 0, "ignore" : 1, @@ -247,17 +262,6 @@ "outputAbbreviatedPath" : "\/compiled\/js\/locale\/en-min.js", "fileType" : 64 }, - "\/compiled\/js\/locale\/it.js" : { - "ignoreWasSetByUser" : 0, - "ignore" : 1, - "hidden" : 0, - "outputPathIsSetByUser" : 0, - "inputAbbreviatedPath" : "\/compiled\/js\/locale\/it.js", - "outputStyle" : 1, - "syntaxCheckerStyle" : 0, - "outputAbbreviatedPath" : "\/compiled\/js\/locale\/it-min.js", - "fileType" : 64 - }, "\/compiled\/generator.html" : { "ignoreWasSetByUser" : 0, "ignore" : 1, @@ -267,40 +271,36 @@ "outputAbbreviatedPath" : "No Output Path", "fileType" : 2048 }, - "\/source\/js\/Core\/Language\/locale\/pt-br.js" : { + "\/compiled\/js\/locale\/it.js" : { "ignoreWasSetByUser" : 0, - "ignore" : 0, + "ignore" : 1, "hidden" : 0, - "outputPathIsSetByUser" : 1, - "inputAbbreviatedPath" : "\/source\/js\/Core\/Language\/locale\/pt-br.js", + "outputPathIsSetByUser" : 0, + "inputAbbreviatedPath" : "\/compiled\/js\/locale\/it.js", "outputStyle" : 1, "syntaxCheckerStyle" : 0, - "outputAbbreviatedPath" : "\/compiled\/js\/locale\/pt-br.js", + "outputAbbreviatedPath" : "\/compiled\/js\/locale\/it-min.js", "fileType" : 64 }, - "\/source\/js\/Core\/Media\/VMM.Media.js" : { + "\/source\/jade\/sections\/example-head.jade" : { "ignoreWasSetByUser" : 0, "ignore" : 1, "hidden" : 0, "outputPathIsSetByUser" : 0, - "inputAbbreviatedPath" : "\/source\/js\/Core\/Media\/VMM.Media.js", - "outputStyle" : 1, - "syntaxCheckerStyle" : 0, - "outputAbbreviatedPath" : "\/source\/js\/Core\/Media\/VMM.Media-min.js", - "fileType" : 64 + "inputAbbreviatedPath" : "\/source\/jade\/sections\/example-head.jade", + "outputStyle" : 0, + "compileDebug" : 1, + "outputAbbreviatedPath" : "\/source\/jade\/sections\/example-head.html", + "fileType" : 512 }, - "\/source\/less\/Core\/Font\/NewsCycle-Merriweather.less" : { + "\/compiled\/css\/themes\/font\/Rancho-Gudea.css" : { "ignoreWasSetByUser" : 0, "ignore" : 0, "hidden" : 0, - "outputPathIsSetByUser" : 1, - "inputAbbreviatedPath" : "\/source\/less\/Core\/Font\/NewsCycle-Merriweather.less", - "outputStyle" : 1, - "shouldRunBless" : 0, - "outputAbbreviatedPath" : "\/compiled\/css\/themes\/font\/NewsCycle-Merriweather.css", - "strictImports" : 0, - "fileType" : 1, - "debugStyle" : 0 + "outputPathIsSetByUser" : 0, + "inputAbbreviatedPath" : "\/compiled\/css\/themes\/font\/Rancho-Gudea.css", + "outputAbbreviatedPath" : "No Output Path", + "fileType" : 16 }, "\/source\/less\/Core\/Mixins.less" : { "ignoreWasSetByUser" : 0, @@ -337,6 +337,15 @@ "outputAbbreviatedPath" : "\/tests\/test_googlespreadsheet_bc_era_ages_epoch.html", "fileType" : 512 }, + "\/examples\/example_jquery_load.html" : { + "ignoreWasSetByUser" : 0, + "ignore" : 1, + "hidden" : 1, + "outputPathIsSetByUser" : 0, + "inputAbbreviatedPath" : "\/examples\/example_jquery_load.html", + "outputAbbreviatedPath" : "No Output Path", + "fileType" : 2048 + }, "\/compiled\/js\/locale\/zh-tw.js" : { "ignoreWasSetByUser" : 0, "ignore" : 1, @@ -348,17 +357,6 @@ "outputAbbreviatedPath" : "\/compiled\/js\/locale\/zh-tw-min.js", "fileType" : 64 }, - "\/source\/jade\/example_storify.jade" : { - "ignoreWasSetByUser" : 0, - "ignore" : 0, - "hidden" : 0, - "outputPathIsSetByUser" : 1, - "inputAbbreviatedPath" : "\/source\/jade\/example_storify.jade", - "outputStyle" : 0, - "compileDebug" : 1, - "outputAbbreviatedPath" : "\/examples\/example_storify.html", - "fileType" : 512 - }, "\/compiled\/css\/themes\/font\/PT.css" : { "ignoreWasSetByUser" : 0, "ignore" : 0, @@ -388,16 +386,27 @@ "outputAbbreviatedPath" : "No Output Path", "fileType" : 2048 }, - "\/source\/js\/Core\/Core\/VMM.Date.js" : { + "\/source\/jade\/example_storify.jade" : { "ignoreWasSetByUser" : 0, - "ignore" : 1, + "ignore" : 0, "hidden" : 0, - "outputPathIsSetByUser" : 0, - "inputAbbreviatedPath" : "\/source\/js\/Core\/Core\/VMM.Date.js", - "outputStyle" : 1, - "syntaxCheckerStyle" : 0, - "outputAbbreviatedPath" : "\/source\/js\/Core\/Core\/VMM.Date-min.js", - "fileType" : 64 + "outputPathIsSetByUser" : 1, + "inputAbbreviatedPath" : "\/source\/jade\/example_storify.jade", + "outputStyle" : 0, + "compileDebug" : 1, + "outputAbbreviatedPath" : "\/examples\/example_storify.html", + "fileType" : 512 + }, + "\/source\/jade\/example_json.jade" : { + "ignoreWasSetByUser" : 0, + "ignore" : 0, + "hidden" : 0, + "outputPathIsSetByUser" : 1, + "inputAbbreviatedPath" : "\/source\/jade\/example_json.jade", + "outputStyle" : 0, + "compileDebug" : 1, + "outputAbbreviatedPath" : "\/examples\/example_json.html", + "fileType" : 512 }, "\/source\/js\/Core\/Slider\/VMM.Slider.js" : { "ignoreWasSetByUser" : 0, @@ -410,15 +419,6 @@ "outputAbbreviatedPath" : "\/source\/js\/Core\/Slider\/VMM.Slider-min.js", "fileType" : 64 }, - "\/examples\/example_jquery_load.html" : { - "ignoreWasSetByUser" : 0, - "ignore" : 1, - "hidden" : 1, - "outputPathIsSetByUser" : 0, - "inputAbbreviatedPath" : "\/examples\/example_jquery_load.html", - "outputAbbreviatedPath" : "No Output Path", - "fileType" : 2048 - }, "\/compiled\/css\/themes\/timeline-dark.png" : { "ignoreWasSetByUser" : 0, "ignore" : 0, @@ -430,26 +430,15 @@ "initialSize" : 15505, "fileType" : 8192 }, - "\/source\/jade\/example_json.jade" : { - "ignoreWasSetByUser" : 0, - "ignore" : 0, - "hidden" : 0, - "outputPathIsSetByUser" : 1, - "inputAbbreviatedPath" : "\/source\/jade\/example_json.jade", - "outputStyle" : 0, - "compileDebug" : 1, - "outputAbbreviatedPath" : "\/examples\/example_json.html", - "fileType" : 512 - }, - "\/compiled\/js\/locale\/de.js" : { + "\/source\/js\/Core\/Core\/VMM.Date.js" : { "ignoreWasSetByUser" : 0, "ignore" : 1, "hidden" : 0, "outputPathIsSetByUser" : 0, - "inputAbbreviatedPath" : "\/compiled\/js\/locale\/de.js", + "inputAbbreviatedPath" : "\/source\/js\/Core\/Core\/VMM.Date.js", "outputStyle" : 1, "syntaxCheckerStyle" : 0, - "outputAbbreviatedPath" : "\/compiled\/js\/locale\/de-min.js", + "outputAbbreviatedPath" : "\/source\/js\/Core\/Core\/VMM.Date-min.js", "fileType" : 64 }, "\/compiled\/js\/storyjs-embed-generator.js" : { @@ -463,6 +452,17 @@ "outputAbbreviatedPath" : "\/compiled\/js\/storyjs-embed-generator-min.js", "fileType" : 64 }, + "\/compiled\/js\/locale\/de.js" : { + "ignoreWasSetByUser" : 0, + "ignore" : 1, + "hidden" : 0, + "outputPathIsSetByUser" : 0, + "inputAbbreviatedPath" : "\/compiled\/js\/locale\/de.js", + "outputStyle" : 1, + "syntaxCheckerStyle" : 0, + "outputAbbreviatedPath" : "\/compiled\/js\/locale\/de-min.js", + "fileType" : 64 + }, "\/compiled\/js\/locale\/iw.js" : { "ignoreWasSetByUser" : 0, "ignore" : 1, @@ -505,15 +505,6 @@ "initialSize" : 49145, "fileType" : 8192 }, - "\/compiled\/css\/themes\/font\/Arvo-PTSans.css" : { - "ignoreWasSetByUser" : 0, - "ignore" : 0, - "hidden" : 0, - "outputPathIsSetByUser" : 0, - "inputAbbreviatedPath" : "\/compiled\/css\/themes\/font\/Arvo-PTSans.css", - "outputAbbreviatedPath" : "No Output Path", - "fileType" : 16 - }, "\/dev_examples\/archive\/middle-east\/MohamedBouazizi.jpg" : { "ignoreWasSetByUser" : 0, "ignore" : 0, @@ -525,6 +516,15 @@ "initialSize" : 79732, "fileType" : 4096 }, + "\/compiled\/css\/themes\/font\/Arvo-PTSans.css" : { + "ignoreWasSetByUser" : 0, + "ignore" : 0, + "hidden" : 0, + "outputPathIsSetByUser" : 0, + "inputAbbreviatedPath" : "\/compiled\/css\/themes\/font\/Arvo-PTSans.css", + "outputAbbreviatedPath" : "No Output Path", + "fileType" : 16 + }, "\/compiled\/css\/timeline.png" : { "ignoreWasSetByUser" : 0, "ignore" : 0, @@ -595,6 +595,15 @@ "outputAbbreviatedPath" : "\/compiled\/js\/locale\/en.js", "fileType" : 64 }, + "\/compiled\/index.html" : { + "ignoreWasSetByUser" : 0, + "ignore" : 1, + "hidden" : 1, + "outputPathIsSetByUser" : 0, + "inputAbbreviatedPath" : "\/compiled\/index.html", + "outputAbbreviatedPath" : "No Output Path", + "fileType" : 2048 + }, "\/source\/less\/Core\/Font\/NixieOne-Ledger.less" : { "ignoreWasSetByUser" : 0, "ignore" : 0, @@ -608,15 +617,6 @@ "fileType" : 1, "debugStyle" : 0 }, - "\/compiled\/index.html" : { - "ignoreWasSetByUser" : 0, - "ignore" : 1, - "hidden" : 1, - "outputPathIsSetByUser" : 0, - "inputAbbreviatedPath" : "\/compiled\/index.html", - "outputAbbreviatedPath" : "No Output Path", - "fileType" : 2048 - }, "\/dev_examples\/archive\/taylor\/burton-2.jpg" : { "ignoreWasSetByUser" : 0, "ignore" : 0, @@ -766,17 +766,6 @@ "fileType" : 1, "debugStyle" : 0 }, - "\/dev_examples\/archive\/taylor\/aids.jpg" : { - "ignoreWasSetByUser" : 0, - "ignore" : 0, - "hidden" : 0, - "outputPathIsSetByUser" : 0, - "inputAbbreviatedPath" : "\/dev_examples\/archive\/taylor\/aids.jpg", - "processed" : 0, - "outputAbbreviatedPath" : "\/dev_examples\/archive\/taylor\/aids.jpg", - "initialSize" : 75647, - "fileType" : 4096 - }, "\/compiled\/js\/locale\/eu.js" : { "ignoreWasSetByUser" : 0, "ignore" : 1, @@ -788,6 +777,17 @@ "outputAbbreviatedPath" : "\/compiled\/js\/locale\/eu-min.js", "fileType" : 64 }, + "\/dev_examples\/archive\/taylor\/aids.jpg" : { + "ignoreWasSetByUser" : 0, + "ignore" : 0, + "hidden" : 0, + "outputPathIsSetByUser" : 0, + "inputAbbreviatedPath" : "\/dev_examples\/archive\/taylor\/aids.jpg", + "processed" : 0, + "outputAbbreviatedPath" : "\/dev_examples\/archive\/taylor\/aids.jpg", + "initialSize" : 75647, + "fileType" : 4096 + }, "\/dev_examples\/archive\/taylor\/broadway.jpg" : { "ignoreWasSetByUser" : 0, "ignore" : 0, @@ -832,15 +832,15 @@ "outputAbbreviatedPath" : "\/compiled\/js\/timeline-min-min.js", "fileType" : 64 }, - "\/compiled\/js\/locale\/dk.js" : { + "\/source\/js\/VMM.TImeline.Min.js" : { "ignoreWasSetByUser" : 0, - "ignore" : 1, + "ignore" : 0, "hidden" : 0, - "outputPathIsSetByUser" : 0, - "inputAbbreviatedPath" : "\/compiled\/js\/locale\/dk.js", + "outputPathIsSetByUser" : 1, + "inputAbbreviatedPath" : "\/source\/js\/VMM.TImeline.Min.js", "outputStyle" : 1, "syntaxCheckerStyle" : 0, - "outputAbbreviatedPath" : "\/compiled\/js\/locale\/dk-min.js", + "outputAbbreviatedPath" : "\/compiled\/js\/timeline-min.js", "fileType" : 64 }, "\/source\/less\/Core\/GFX.less" : { @@ -856,17 +856,6 @@ "fileType" : 1, "debugStyle" : 0 }, - "\/source\/js\/VMM.Timeline.License.js" : { - "ignoreWasSetByUser" : 0, - "ignore" : 1, - "hidden" : 0, - "outputPathIsSetByUser" : 0, - "inputAbbreviatedPath" : "\/source\/js\/VMM.Timeline.License.js", - "outputStyle" : 1, - "syntaxCheckerStyle" : 0, - "outputAbbreviatedPath" : "\/source\/js\/VMM.Timeline.License-min.js", - "fileType" : 64 - }, "\/source\/less\/Core\/Font\/DroidSerif-DroidSans.less" : { "ignoreWasSetByUser" : 0, "ignore" : 0, @@ -880,6 +869,17 @@ "fileType" : 1, "debugStyle" : 0 }, + "\/compiled\/js\/locale\/dk.js" : { + "ignoreWasSetByUser" : 0, + "ignore" : 1, + "hidden" : 0, + "outputPathIsSetByUser" : 0, + "inputAbbreviatedPath" : "\/compiled\/js\/locale\/dk.js", + "outputStyle" : 1, + "syntaxCheckerStyle" : 0, + "outputAbbreviatedPath" : "\/compiled\/js\/locale\/dk-min.js", + "fileType" : 64 + }, "\/tests\/test_utc_firefox.html" : { "ignoreWasSetByUser" : 0, "ignore" : 1, @@ -900,16 +900,16 @@ "outputAbbreviatedPath" : "\/compiled\/js\/locale\/fr.js", "fileType" : 64 }, - "\/compiled\/css\/timeline@2x.png" : { + "\/source\/js\/Core\/Media\/VMM.TextElement.js" : { "ignoreWasSetByUser" : 0, - "ignore" : 0, + "ignore" : 1, "hidden" : 0, "outputPathIsSetByUser" : 0, - "inputAbbreviatedPath" : "\/compiled\/css\/timeline@2x.png", - "processed" : 0, - "outputAbbreviatedPath" : "\/compiled\/css\/timeline@2x.png", - "initialSize" : 49364, - "fileType" : 8192 + "inputAbbreviatedPath" : "\/source\/js\/Core\/Media\/VMM.TextElement.js", + "outputStyle" : 1, + "syntaxCheckerStyle" : 0, + "outputAbbreviatedPath" : "\/source\/js\/Core\/Media\/VMM.TextElement-min.js", + "fileType" : 64 }, "\/source\/less\/Core\/Font\/BreeSerif-OpenSans.less" : { "ignoreWasSetByUser" : 0, @@ -935,6 +935,17 @@ "outputAbbreviatedPath" : "\/compiled\/js\/locale\/ta.js", "fileType" : 64 }, + "\/source\/js\/Core\/Language\/locale\/hu.js" : { + "ignoreWasSetByUser" : 0, + "ignore" : 0, + "hidden" : 0, + "outputPathIsSetByUser" : 1, + "inputAbbreviatedPath" : "\/source\/js\/Core\/Language\/locale\/hu.js", + "outputStyle" : 1, + "syntaxCheckerStyle" : 0, + "outputAbbreviatedPath" : "\/compiled\/js\/locale\/hu.js", + "fileType" : 64 + }, "\/source\/less\/Core\/VMM.Core.less" : { "ignoreWasSetByUser" : 1, "ignore" : 1, @@ -948,19 +959,6 @@ "fileType" : 1, "debugStyle" : 0 }, - "\/source\/less\/VMM.Timeline.TimeNav.less" : { - "ignoreWasSetByUser" : 0, - "ignore" : 1, - "hidden" : 0, - "outputPathIsSetByUser" : 0, - "inputAbbreviatedPath" : "\/source\/less\/VMM.Timeline.TimeNav.less", - "outputStyle" : 1, - "shouldRunBless" : 0, - "outputAbbreviatedPath" : "\/source\/css\/VMM.Timeline.TimeNav.css", - "strictImports" : 0, - "fileType" : 1, - "debugStyle" : 0 - }, "\/source\/less\/Theme\/Dark.less" : { "ignoreWasSetByUser" : 1, "ignore" : 0, @@ -1016,27 +1014,29 @@ "outputAbbreviatedPath" : "\/compiled\/lib\/jquery-min-min.js", "fileType" : 64 }, - "\/source\/js\/Core\/Language\/locale\/hu.js" : { + "\/compiled\/css\/timeline@2x.png" : { "ignoreWasSetByUser" : 0, "ignore" : 0, "hidden" : 0, - "outputPathIsSetByUser" : 1, - "inputAbbreviatedPath" : "\/source\/js\/Core\/Language\/locale\/hu.js", - "outputStyle" : 1, - "syntaxCheckerStyle" : 0, - "outputAbbreviatedPath" : "\/compiled\/js\/locale\/hu.js", - "fileType" : 64 + "outputPathIsSetByUser" : 0, + "inputAbbreviatedPath" : "\/compiled\/css\/timeline@2x.png", + "processed" : 0, + "outputAbbreviatedPath" : "\/compiled\/css\/timeline@2x.png", + "initialSize" : 49364, + "fileType" : 8192 }, - "\/source\/js\/Core\/Media\/VMM.TextElement.js" : { + "\/source\/less\/VMM.Timeline.TimeNav.less" : { "ignoreWasSetByUser" : 0, "ignore" : 1, "hidden" : 0, "outputPathIsSetByUser" : 0, - "inputAbbreviatedPath" : "\/source\/js\/Core\/Media\/VMM.TextElement.js", + "inputAbbreviatedPath" : "\/source\/less\/VMM.Timeline.TimeNav.less", "outputStyle" : 1, - "syntaxCheckerStyle" : 0, - "outputAbbreviatedPath" : "\/source\/js\/Core\/Media\/VMM.TextElement-min.js", - "fileType" : 64 + "shouldRunBless" : 0, + "outputAbbreviatedPath" : "\/source\/css\/VMM.Timeline.TimeNav.css", + "strictImports" : 0, + "fileType" : 1, + "debugStyle" : 0 }, "\/compiled\/js\/locale\/ar.js" : { "ignoreWasSetByUser" : 0, @@ -1071,15 +1071,15 @@ "outputAbbreviatedPath" : "No Output Path", "fileType" : 2048 }, - "\/source\/js\/VMM.TImeline.Min.js" : { + "\/source\/js\/VMM.Timeline.License.js" : { "ignoreWasSetByUser" : 0, - "ignore" : 0, + "ignore" : 1, "hidden" : 0, - "outputPathIsSetByUser" : 1, - "inputAbbreviatedPath" : "\/source\/js\/VMM.TImeline.Min.js", + "outputPathIsSetByUser" : 0, + "inputAbbreviatedPath" : "\/source\/js\/VMM.Timeline.License.js", "outputStyle" : 1, "syntaxCheckerStyle" : 0, - "outputAbbreviatedPath" : "\/compiled\/js\/timeline-min.js", + "outputAbbreviatedPath" : "\/source\/js\/VMM.Timeline.License-min.js", "fileType" : 64 }, "\/source\/js\/Core\/Slider\/VMM.Slider.Slide.js" : { @@ -1104,26 +1104,26 @@ "outputAbbreviatedPath" : "\/compiled\/js\/locale\/ko-min.js", "fileType" : 64 }, - "\/source\/js\/Core\/Language\/locale\/is.js" : { + "\/compiled\/js\/locale\/pt-br.js" : { "ignoreWasSetByUser" : 0, - "ignore" : 0, + "ignore" : 1, "hidden" : 0, - "outputPathIsSetByUser" : 1, - "inputAbbreviatedPath" : "\/source\/js\/Core\/Language\/locale\/is.js", + "outputPathIsSetByUser" : 0, + "inputAbbreviatedPath" : "\/compiled\/js\/locale\/pt-br.js", "outputStyle" : 1, "syntaxCheckerStyle" : 0, - "outputAbbreviatedPath" : "\/compiled\/js\/locale\/is.js", + "outputAbbreviatedPath" : "\/compiled\/js\/locale\/pt-br-min.js", "fileType" : 64 }, - "\/compiled\/js\/locale\/pt-br.js" : { + "\/source\/js\/Core\/Library\/bootstrap-tooltip.js" : { "ignoreWasSetByUser" : 0, "ignore" : 1, "hidden" : 0, "outputPathIsSetByUser" : 0, - "inputAbbreviatedPath" : "\/compiled\/js\/locale\/pt-br.js", + "inputAbbreviatedPath" : "\/source\/js\/Core\/Library\/bootstrap-tooltip.js", "outputStyle" : 1, "syntaxCheckerStyle" : 0, - "outputAbbreviatedPath" : "\/compiled\/js\/locale\/pt-br-min.js", + "outputAbbreviatedPath" : "\/source\/js\/Core\/Library\/bootstrap-tooltip-min.js", "fileType" : 64 }, "\/compiled\/css\/themes\/font\/Bevan-PotanoSans.css" : { @@ -1135,15 +1135,15 @@ "outputAbbreviatedPath" : "No Output Path", "fileType" : 16 }, - "\/source\/js\/Core\/Library\/bootstrap-tooltip.js" : { + "\/source\/js\/Core\/Language\/locale\/is.js" : { "ignoreWasSetByUser" : 0, - "ignore" : 1, + "ignore" : 0, "hidden" : 0, - "outputPathIsSetByUser" : 0, - "inputAbbreviatedPath" : "\/source\/js\/Core\/Library\/bootstrap-tooltip.js", + "outputPathIsSetByUser" : 1, + "inputAbbreviatedPath" : "\/source\/js\/Core\/Language\/locale\/is.js", "outputStyle" : 1, "syntaxCheckerStyle" : 0, - "outputAbbreviatedPath" : "\/source\/js\/Core\/Library\/bootstrap-tooltip-min.js", + "outputAbbreviatedPath" : "\/compiled\/js\/locale\/is.js", "fileType" : 64 }, "\/compiled\/js\/timeline.js" : { @@ -1179,26 +1179,26 @@ "outputAbbreviatedPath" : "\/source\/js\/VMM.Timeline.DataObj-min.js", "fileType" : 64 }, - "\/compiled\/js\/locale\/hu.js" : { + "\/compiled\/js\/locale\/ta.js" : { "ignoreWasSetByUser" : 0, "ignore" : 1, "hidden" : 0, "outputPathIsSetByUser" : 0, - "inputAbbreviatedPath" : "\/compiled\/js\/locale\/hu.js", + "inputAbbreviatedPath" : "\/compiled\/js\/locale\/ta.js", "outputStyle" : 1, "syntaxCheckerStyle" : 0, - "outputAbbreviatedPath" : "\/compiled\/js\/locale\/hu-min.js", + "outputAbbreviatedPath" : "\/compiled\/js\/locale\/ta-min.js", "fileType" : 64 }, - "\/compiled\/js\/locale\/ta.js" : { + "\/compiled\/js\/locale\/hu.js" : { "ignoreWasSetByUser" : 0, "ignore" : 1, "hidden" : 0, "outputPathIsSetByUser" : 0, - "inputAbbreviatedPath" : "\/compiled\/js\/locale\/ta.js", + "inputAbbreviatedPath" : "\/compiled\/js\/locale\/hu.js", "outputStyle" : 1, "syntaxCheckerStyle" : 0, - "outputAbbreviatedPath" : "\/compiled\/js\/locale\/ta-min.js", + "outputAbbreviatedPath" : "\/compiled\/js\/locale\/hu-min.js", "fileType" : 64 }, "\/dev_examples\/archive\/taylor\/warner.jpg" : { @@ -1362,37 +1362,37 @@ "outputAbbreviatedPath" : "\/source\/js\/Core\/Core\/VMM.FileExtention-min.js", "fileType" : 64 }, - "\/source\/js\/Core\/Language\/locale\/da.js" : { + "\/compiled\/js\/locale\/ru.js" : { "ignoreWasSetByUser" : 0, - "ignore" : 0, + "ignore" : 1, "hidden" : 0, - "outputPathIsSetByUser" : 1, - "inputAbbreviatedPath" : "\/source\/js\/Core\/Language\/locale\/da.js", + "outputPathIsSetByUser" : 0, + "inputAbbreviatedPath" : "\/compiled\/js\/locale\/ru.js", "outputStyle" : 1, "syntaxCheckerStyle" : 0, - "outputAbbreviatedPath" : "\/compiled\/js\/locale\/da.js", + "outputAbbreviatedPath" : "\/compiled\/js\/locale\/ru-min.js", "fileType" : 64 }, - "\/compiled\/js\/locale\/no.js" : { + "\/compiled\/js\/locale\/hy.js" : { "ignoreWasSetByUser" : 0, "ignore" : 1, "hidden" : 0, "outputPathIsSetByUser" : 0, - "inputAbbreviatedPath" : "\/compiled\/js\/locale\/no.js", + "inputAbbreviatedPath" : "\/compiled\/js\/locale\/hy.js", "outputStyle" : 1, "syntaxCheckerStyle" : 0, - "outputAbbreviatedPath" : "\/compiled\/js\/locale\/no-min.js", + "outputAbbreviatedPath" : "\/compiled\/js\/locale\/hy-min.js", "fileType" : 64 }, - "\/compiled\/js\/locale\/ru.js" : { + "\/compiled\/js\/locale\/no.js" : { "ignoreWasSetByUser" : 0, "ignore" : 1, "hidden" : 0, "outputPathIsSetByUser" : 0, - "inputAbbreviatedPath" : "\/compiled\/js\/locale\/ru.js", + "inputAbbreviatedPath" : "\/compiled\/js\/locale\/no.js", "outputStyle" : 1, "syntaxCheckerStyle" : 0, - "outputAbbreviatedPath" : "\/compiled\/js\/locale\/ru-min.js", + "outputAbbreviatedPath" : "\/compiled\/js\/locale\/no-min.js", "fileType" : 64 }, "\/tests\/test_googlespreadsheet_bc_era_ages_epoch.html" : { @@ -1426,56 +1426,47 @@ "outputAbbreviatedPath" : "\/source\/js\/Core\/Media\/VMM.MediaType-min.js", "fileType" : 64 }, - "\/dev_examples\/archive\/template_html\/index.html" : { - "ignoreWasSetByUser" : 0, - "ignore" : 0, - "hidden" : 0, - "outputPathIsSetByUser" : 0, - "inputAbbreviatedPath" : "\/dev_examples\/archive\/template_html\/index.html", - "outputAbbreviatedPath" : "No Output Path", - "fileType" : 2048 - }, - "\/source\/js\/Core\/Embed\/Embed.CDN.js" : { + "\/source\/js\/Core\/Language\/locale\/el.js" : { "ignoreWasSetByUser" : 0, "ignore" : 0, "hidden" : 0, "outputPathIsSetByUser" : 1, - "inputAbbreviatedPath" : "\/source\/js\/Core\/Embed\/Embed.CDN.js", + "inputAbbreviatedPath" : "\/source\/js\/Core\/Language\/locale\/el.js", "outputStyle" : 1, "syntaxCheckerStyle" : 0, - "outputAbbreviatedPath" : "\/compiled\/js\/storyjs-embed-cdn.js", + "outputAbbreviatedPath" : "\/compiled\/js\/locale\/el.js", "fileType" : 64 }, - "\/source\/js\/Core\/Language\/locale\/el.js" : { + "\/source\/js\/Core\/Language\/locale\/da.js" : { "ignoreWasSetByUser" : 0, "ignore" : 0, "hidden" : 0, "outputPathIsSetByUser" : 1, - "inputAbbreviatedPath" : "\/source\/js\/Core\/Language\/locale\/el.js", + "inputAbbreviatedPath" : "\/source\/js\/Core\/Language\/locale\/da.js", "outputStyle" : 1, "syntaxCheckerStyle" : 0, - "outputAbbreviatedPath" : "\/compiled\/js\/locale\/el.js", + "outputAbbreviatedPath" : "\/compiled\/js\/locale\/da.js", "fileType" : 64 }, - "\/compiled\/js\/locale\/hy.js" : { + "\/source\/js\/Core\/Embed\/Embed.CDN.js" : { "ignoreWasSetByUser" : 0, - "ignore" : 1, + "ignore" : 0, "hidden" : 0, - "outputPathIsSetByUser" : 0, - "inputAbbreviatedPath" : "\/compiled\/js\/locale\/hy.js", + "outputPathIsSetByUser" : 1, + "inputAbbreviatedPath" : "\/source\/js\/Core\/Embed\/Embed.CDN.js", "outputStyle" : 1, "syntaxCheckerStyle" : 0, - "outputAbbreviatedPath" : "\/compiled\/js\/locale\/hy-min.js", + "outputAbbreviatedPath" : "\/compiled\/js\/storyjs-embed-cdn.js", "fileType" : 64 }, - "\/compiled\/css\/themes\/font\/PTSerif-PTSans.css" : { + "\/dev_examples\/archive\/template_html\/index.html" : { "ignoreWasSetByUser" : 0, "ignore" : 0, "hidden" : 0, "outputPathIsSetByUser" : 0, - "inputAbbreviatedPath" : "\/compiled\/css\/themes\/font\/PTSerif-PTSans.css", + "inputAbbreviatedPath" : "\/dev_examples\/archive\/template_html\/index.html", "outputAbbreviatedPath" : "No Output Path", - "fileType" : 16 + "fileType" : 2048 }, "\/source\/js\/Core\/Language\/locale\/sr-cy.js" : { "ignoreWasSetByUser" : 0, @@ -1499,6 +1490,15 @@ "outputAbbreviatedPath" : "\/source\/jade\/sections\/embed-generator.html", "fileType" : 512 }, + "\/compiled\/css\/themes\/font\/PTSerif-PTSans.css" : { + "ignoreWasSetByUser" : 0, + "ignore" : 0, + "hidden" : 0, + "outputPathIsSetByUser" : 0, + "inputAbbreviatedPath" : "\/compiled\/css\/themes\/font\/PTSerif-PTSans.css", + "outputAbbreviatedPath" : "No Output Path", + "fileType" : 16 + }, "\/source\/js\/Core\/VMM.StoryJS.License.js" : { "ignoreWasSetByUser" : 0, "ignore" : 1, @@ -2169,6 +2169,19 @@ "outputAbbreviatedPath" : "No Output Path", "fileType" : 16 }, + "\/source\/less\/Core\/Font\/Lora-Istok.less" : { + "ignoreWasSetByUser" : 0, + "ignore" : 0, + "hidden" : 0, + "outputPathIsSetByUser" : 0, + "inputAbbreviatedPath" : "\/source\/less\/Core\/Font\/Lora-Istok.less", + "outputStyle" : 1, + "shouldRunBless" : 0, + "outputAbbreviatedPath" : "\/source\/less\/Core\/css\/Lora-Istok.css", + "strictImports" : 0, + "fileType" : 1, + "debugStyle" : 0 + }, "\/source\/js\/Core\/Media\/VMM.MediaElement.js" : { "ignoreWasSetByUser" : 0, "ignore" : 1, @@ -2200,17 +2213,6 @@ "outputAbbreviatedPath" : "No Output Path", "fileType" : 16 }, - "\/source\/js\/Core\/Language\/locale\/sl.js" : { - "ignoreWasSetByUser" : 0, - "ignore" : 0, - "hidden" : 0, - "outputPathIsSetByUser" : 1, - "inputAbbreviatedPath" : "\/source\/js\/Core\/Language\/locale\/sl.js", - "outputStyle" : 1, - "syntaxCheckerStyle" : 0, - "outputAbbreviatedPath" : "\/compiled\/js\/locale\/sl.js", - "fileType" : 64 - }, "\/source\/js\/Core\/Core\/VMM.Browser.js" : { "ignoreWasSetByUser" : 0, "ignore" : 1, @@ -2222,19 +2224,6 @@ "outputAbbreviatedPath" : "\/source\/js\/Core\/Core\/VMM.Browser-min.js", "fileType" : 64 }, - "\/source\/less\/Core\/Font\/Lora-Istok.less" : { - "ignoreWasSetByUser" : 0, - "ignore" : 0, - "hidden" : 0, - "outputPathIsSetByUser" : 0, - "inputAbbreviatedPath" : "\/source\/less\/Core\/Font\/Lora-Istok.less", - "outputStyle" : 1, - "shouldRunBless" : 0, - "outputAbbreviatedPath" : "\/source\/less\/Core\/css\/Lora-Istok.css", - "strictImports" : 0, - "fileType" : 1, - "debugStyle" : 0 - }, "\/source\/jade\/tests\/test_utc_firefox.jade" : { "ignoreWasSetByUser" : 0, "ignore" : 0, @@ -2246,6 +2235,17 @@ "outputAbbreviatedPath" : "\/tests\/test_utc_firefox.html", "fileType" : 512 }, + "\/source\/js\/Core\/Language\/locale\/sl.js" : { + "ignoreWasSetByUser" : 0, + "ignore" : 0, + "hidden" : 0, + "outputPathIsSetByUser" : 1, + "inputAbbreviatedPath" : "\/source\/js\/Core\/Language\/locale\/sl.js", + "outputStyle" : 1, + "syntaxCheckerStyle" : 0, + "outputAbbreviatedPath" : "\/compiled\/js\/locale\/sl.js", + "fileType" : 64 + }, "\/source\/js\/Core\/Language\/locale\/de.js" : { "ignoreWasSetByUser" : 0, "ignore" : 0, @@ -2329,17 +2329,6 @@ "fileType" : 1, "debugStyle" : 0 }, - "\/dev_examples\/archive\/taylor\/final.jpg" : { - "ignoreWasSetByUser" : 0, - "ignore" : 0, - "hidden" : 0, - "outputPathIsSetByUser" : 0, - "inputAbbreviatedPath" : "\/dev_examples\/archive\/taylor\/final.jpg", - "processed" : 0, - "outputAbbreviatedPath" : "\/dev_examples\/archive\/taylor\/final.jpg", - "initialSize" : 56926, - "fileType" : 4096 - }, "\/source\/js\/Core\/Language\/locale\/zh-tw.js" : { "ignoreWasSetByUser" : 0, "ignore" : 0, @@ -2360,6 +2349,17 @@ "outputAbbreviatedPath" : "No Output Path", "fileType" : 16 }, + "\/dev_examples\/archive\/taylor\/final.jpg" : { + "ignoreWasSetByUser" : 0, + "ignore" : 0, + "hidden" : 0, + "outputPathIsSetByUser" : 0, + "inputAbbreviatedPath" : "\/dev_examples\/archive\/taylor\/final.jpg", + "processed" : 0, + "outputAbbreviatedPath" : "\/dev_examples\/archive\/taylor\/final.jpg", + "initialSize" : 56926, + "fileType" : 4096 + }, "\/examples\/example_jsonp.html" : { "ignoreWasSetByUser" : 0, "ignore" : 1, @@ -2369,17 +2369,6 @@ "outputAbbreviatedPath" : "No Output Path", "fileType" : 2048 }, - "\/source\/js\/Core\/Language\/locale\/ja.js" : { - "ignoreWasSetByUser" : 0, - "ignore" : 0, - "hidden" : 0, - "outputPathIsSetByUser" : 1, - "inputAbbreviatedPath" : "\/source\/js\/Core\/Language\/locale\/ja.js", - "outputStyle" : 1, - "syntaxCheckerStyle" : 0, - "outputAbbreviatedPath" : "\/compiled\/js\/locale\/ja.js", - "fileType" : 64 - }, "\/compiled\/js\/locale\/zh-ch.js" : { "ignoreWasSetByUser" : 0, "ignore" : 1, @@ -2402,6 +2391,17 @@ "outputAbbreviatedPath" : "\/source\/js\/Core\/Slider\/VMM.DragSlider-min.js", "fileType" : 64 }, + "\/source\/js\/Core\/Language\/locale\/ja.js" : { + "ignoreWasSetByUser" : 0, + "ignore" : 0, + "hidden" : 0, + "outputPathIsSetByUser" : 1, + "inputAbbreviatedPath" : "\/source\/js\/Core\/Language\/locale\/ja.js", + "outputStyle" : 1, + "syntaxCheckerStyle" : 0, + "outputAbbreviatedPath" : "\/compiled\/js\/locale\/ja.js", + "fileType" : 64 + }, "\/compiled\/css\/themes\/font\/BreeSerif-OpenSans.css" : { "ignoreWasSetByUser" : 0, "ignore" : 0, @@ -2468,14 +2468,16 @@ "outputAbbreviatedPath" : "\/compiled\/generator.html", "fileType" : 512 }, - "\/dev_examples\/archive\/kitchen-sink\/index.html" : { + "\/compiled\/js\/locale\/sl.js" : { "ignoreWasSetByUser" : 0, - "ignore" : 0, + "ignore" : 1, "hidden" : 0, "outputPathIsSetByUser" : 0, - "inputAbbreviatedPath" : "\/dev_examples\/archive\/kitchen-sink\/index.html", - "outputAbbreviatedPath" : "No Output Path", - "fileType" : 2048 + "inputAbbreviatedPath" : "\/compiled\/js\/locale\/sl.js", + "outputStyle" : 1, + "syntaxCheckerStyle" : 0, + "outputAbbreviatedPath" : "\/compiled\/js\/locale\/sl-min.js", + "fileType" : 64 }, "\/compiled\/js\/locale\/cz.js" : { "ignoreWasSetByUser" : 0, @@ -2499,16 +2501,14 @@ "outputAbbreviatedPath" : "\/source\/js\/Core\/Library\/jQuery\/easing-min.js", "fileType" : 64 }, - "\/compiled\/js\/locale\/sl.js" : { + "\/dev_examples\/archive\/kitchen-sink\/index.html" : { "ignoreWasSetByUser" : 0, - "ignore" : 1, + "ignore" : 0, "hidden" : 0, "outputPathIsSetByUser" : 0, - "inputAbbreviatedPath" : "\/compiled\/js\/locale\/sl.js", - "outputStyle" : 1, - "syntaxCheckerStyle" : 0, - "outputAbbreviatedPath" : "\/compiled\/js\/locale\/sl-min.js", - "fileType" : 64 + "inputAbbreviatedPath" : "\/dev_examples\/archive\/kitchen-sink\/index.html", + "outputAbbreviatedPath" : "No Output Path", + "fileType" : 2048 } }, "manualImportLinks" : [ diff --git a/examples/example_json.json b/examples/example_json.json index ba668a5..20a663f 100644 --- a/examples/example_json.json +++ b/examples/example_json.json @@ -7,6 +7,18 @@ "text":"People say stuff", "startDate":"2012,1,26", "date": [ + { + "startDate":"2011,12,12", + "endDate":"2012,1,27", + "headline":"Vine", + "text":"

Vine Test

", + "asset": + { + "media":"https://vine.co/v/b55LOA1dgJU", + "credit":"", + "caption":"" + } + }, { "startDate":"2012,1,26", "endDate":"2012,1,27", diff --git a/source/js/Core b/source/js/Core index 87a61b1..9bb073c 160000 --- a/source/js/Core +++ b/source/js/Core @@ -1 +1 @@ -Subproject commit 87a61b1ce267f47049aee21ef4fea0188764dc9c +Subproject commit 9bb073cd817344fae496b378ac5412760fb6ee92 diff --git a/tests/test_extra_html.json b/tests/test_extra_html.json index ada9d11..54ff4f7 100644 --- a/tests/test_extra_html.json +++ b/tests/test_extra_html.json @@ -14,14 +14,15 @@ "date": [ { "startDate":"2004", - "headline":"How do purchases get from your virtual shopping cart to the doorstep?

There are two ways.", + "headline":"How do purchases get from your virtual shopping cart to the doorstep? There are two ways.", "text":"", "asset": { - "media":"", - "credit":"", + "media":"https://vine.co/v/b55LOA1dgJU", + "credit":"", "caption":"" } + }, {