playground
/
TimelineJS
mirror of https://github.com/NUKnightLab/TimelineJS.git
1
0
Fork 0
Code Issues Releases Activity
Browse Source

Fixing some merge issues

pull/127/head
Zach Wise 13 years ago
parent
66f36cfd99
commit
41f8b0a367
16 changed files with 265 additions and 590 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 493
      codekit-config.json
  2. 2
      compiled/js/locale/zh-ch.js
  3. 3
      compiled/js/timeline.js
  4. 32
      locale/de.js
  5. 32
      locale/en.js
  6. 32
      locale/es.js
  7. 32
      locale/fr.js
  8. 32
      locale/is.js
  9. 32
      locale/it.js
  10. 32
      locale/kr.js
  11. 32
      locale/nl.js
  12. 32
      locale/pt-br.js
  13. 32
      locale/zh-ch.js
  14. 32
      locale/zh-tw.js
  15. 3
      source/js/VMM.Timeline.js
  16. 2
      source/js/locale/zh-ch.js

493
codekit-config.json
Unescape View File

@ -57,17 +57,6 @@
"initialSize" : 77001,
"fileType" : 9
},
"\/source\/js\/VMM.Timeline.js" : {
"ignoreWasSetByUser" : 1,
"ignore" : 0,
"hidden" : 0,
"outputPathIsSetByUser" : 1,
"inputAbbreviatedPath" : "\/source\/js\/VMM.Timeline.js",
"outputStyle" : 0,
"syntaxCheckerStyle" : 0,
"outputAbbreviatedPath" : "\/compiled\/js\/timeline.js",
"fileType" : 5
},
"\/dev_examples\/taylor\/born.jpg" : {
"ignoreWasSetByUser" : 0,
"ignore" : 0,
@ -79,6 +68,17 @@
"initialSize" : 50360,
"fileType" : 9
},
"\/source\/js\/locale\/ja.js" : {
"ignoreWasSetByUser" : 0,
"ignore" : 0,
"hidden" : 0,
"outputPathIsSetByUser" : 0,
"inputAbbreviatedPath" : "\/source\/js\/locale\/ja.js",
"outputStyle" : 1,
"syntaxCheckerStyle" : 0,
"outputAbbreviatedPath" : "\/source\/js\/locale\/ja-min.js",
"fileType" : 5
},
"\/source\/js\/VMM.Media.js" : {
"ignoreWasSetByUser" : 0,
"ignore" : 1,
@ -96,7 +96,7 @@
"hidden" : 0,
"outputPathIsSetByUser" : 0,
"inputAbbreviatedPath" : "\/source\/less\/GFX.less",
"outputStyle" : 0,
"outputStyle" : 1,
"shouldRunBless" : 0,
"outputAbbreviatedPath" : "\/source\/css\/GFX.css",
"strictImports" : 0,
@ -113,6 +113,17 @@
"outputAbbreviatedPath" : "\/compiled\/js\/locale\/en.js",
"fileType" : 5
},
"\/source\/js\/VMM.Timeline.js" : {
"ignoreWasSetByUser" : 1,
"ignore" : 0,
"hidden" : 0,
"outputPathIsSetByUser" : 1,
"inputAbbreviatedPath" : "\/source\/js\/VMM.Timeline.js",
"outputStyle" : 0,
"syntaxCheckerStyle" : 0,
"outputAbbreviatedPath" : "\/compiled\/js\/timeline.js",
"fileType" : 5
},
"\/dev_examples\/embed_wide.html" : {
"ignoreWasSetByUser" : 0,
"ignore" : 0,
@ -146,6 +157,15 @@
"strictImports" : 0,
"fileType" : 0
},
"\/examples\/example_kitchensink.html" : {
"ignoreWasSetByUser" : 0,
"ignore" : 0,
"hidden" : 0,
"outputPathIsSetByUser" : 0,
"inputAbbreviatedPath" : "\/examples\/example_kitchensink.html",
"outputAbbreviatedPath" : "No Output Path Set",
"fileType" : 8
},
"\/source\/js\/lib\/bootstrap-tooltip.js" : {
"ignoreWasSetByUser" : 1,
"ignore" : 1,
@ -186,6 +206,17 @@
"outputAbbreviatedPath" : "No Output Path Set",
"fileType" : 8
},
"\/source\/js\/VMM.Timeline.CDN.js" : {
"ignoreWasSetByUser" : 0,
"ignore" : 0,
"hidden" : 0,
"outputPathIsSetByUser" : 1,
"inputAbbreviatedPath" : "\/source\/js\/VMM.Timeline.CDN.js",
"outputStyle" : 1,
"syntaxCheckerStyle" : 0,
"outputAbbreviatedPath" : "\/cdn\/timeline-cdn.js",
"fileType" : 5
},
"\/dev_examples\/taylor\/butterfield.jpg" : {
"ignoreWasSetByUser" : 0,
"ignore" : 0,
@ -307,26 +338,26 @@
"strictImports" : 0,
"fileType" : 0
},
"\/source\/js\/VMM.Timeline.DataObj.js" : {
"\/source\/js\/locale\/zh-tw.js" : {
"ignoreWasSetByUser" : 0,
"ignore" : 1,
"ignore" : 0,
"hidden" : 0,
"outputPathIsSetByUser" : 0,
"inputAbbreviatedPath" : "\/source\/js\/VMM.Timeline.DataObj.js",
"outputPathIsSetByUser" : 1,
"inputAbbreviatedPath" : "\/source\/js\/locale\/zh-tw.js",
"outputStyle" : 1,
"syntaxCheckerStyle" : 0,
"outputAbbreviatedPath" : "\/source\/js\/VMM.Timeline.DataObj-min.js",
"outputAbbreviatedPath" : "\/compiled\/js\/locale\/zh-tw.js",
"fileType" : 5
},
"\/source\/js\/locale\/zh-tw.js" : {
"\/source\/js\/VMM.Timeline.DataObj.js" : {
"ignoreWasSetByUser" : 0,
"ignore" : 0,
"ignore" : 1,
"hidden" : 0,
"outputPathIsSetByUser" : 1,
"inputAbbreviatedPath" : "\/source\/js\/locale\/zh-tw.js",
"outputPathIsSetByUser" : 0,
"inputAbbreviatedPath" : "\/source\/js\/VMM.Timeline.DataObj.js",
"outputStyle" : 1,
"syntaxCheckerStyle" : 0,
"outputAbbreviatedPath" : "\/compiled\/js\/locale\/zh-tw.js",
"outputAbbreviatedPath" : "\/source\/js\/VMM.Timeline.DataObj-min.js",
"fileType" : 5
},
"\/dev_examples\/houston\/whlead.jpg" : {
@ -380,7 +411,7 @@
"inputAbbreviatedPath" : "\/compiled\/js\/timeline-min.js",
"outputStyle" : 1,
"syntaxCheckerStyle" : 0,
"outputAbbreviatedPath" : "\/compiled\/timeline-min-min.js",
"outputAbbreviatedPath" : "\/compiled\/js\/timeline-min-min.js",
"fileType" : 5
},
"\/dev_examples\/taylor\/burton-2.jpg" : {
@ -394,15 +425,6 @@
"initialSize" : 74788,
"fileType" : 9
},
"\/examples\/kitchen-sink\/index.html" : {
"ignoreWasSetByUser" : 0,
"ignore" : 0,
"hidden" : 0,
"outputPathIsSetByUser" : 0,
"inputAbbreviatedPath" : "\/examples\/kitchen-sink\/index.html",
"outputAbbreviatedPath" : "No Output Path Set",
"fileType" : 8
},
"\/dev_examples\/taylor\/sun.jpg" : {
"ignoreWasSetByUser" : 0,
"ignore" : 0,
@ -425,15 +447,6 @@
"outputAbbreviatedPath" : "\/compiled\/js\/timeline-min.js",
"fileType" : 5
},
"\/examples\/template_json\/index.html" : {
"ignoreWasSetByUser" : 0,
"ignore" : 0,
"hidden" : 0,
"outputPathIsSetByUser" : 0,
"inputAbbreviatedPath" : "\/examples\/template_json\/index.html",
"outputAbbreviatedPath" : "No Output Path Set",
"fileType" : 8
},
"\/dev_examples\/taylor\/final.jpg" : {
"ignoreWasSetByUser" : 0,
"ignore" : 0,
@ -508,7 +521,7 @@
"inputAbbreviatedPath" : "\/compiled\/js\/locale\/zh-ch.js",
"outputStyle" : 1,
"syntaxCheckerStyle" : 0,
"outputAbbreviatedPath" : "\/locale\/zh-ch-min.js",
"outputAbbreviatedPath" : "\/compiled\/js\/locale\/zh-ch-min.js",
"fileType" : 5
},
"\/dev_examples\/houston\/wh1.jpg" : {
@ -522,15 +535,6 @@
"initialSize" : 452169,
"fileType" : 9
},
"\/dev_examples\/template_googlespreadsheet\/index.html" : {
"ignoreWasSetByUser" : 0,
"ignore" : 0,
"hidden" : 0,
"outputPathIsSetByUser" : 0,
"inputAbbreviatedPath" : "\/dev_examples\/template_googlespreadsheet\/index.html",
"outputAbbreviatedPath" : "No Output Path Set",
"fileType" : 8
},
"\/source\/less\/Typography.less" : {
"ignoreWasSetByUser" : 0,
"ignore" : 1,
@ -543,9 +547,18 @@
"strictImports" : 0,
"fileType" : 0
},
"\/dev_examples\/template_googlespreadsheet\/index.html" : {
"ignoreWasSetByUser" : 0,
"ignore" : 0,
"hidden" : 0,
"outputPathIsSetByUser" : 0,
"inputAbbreviatedPath" : "\/dev_examples\/template_googlespreadsheet\/index.html",
"outputAbbreviatedPath" : "No Output Path Set",
"fileType" : 8
},
"\/source\/js\/lib\/jQuery\/easing.js" : {
"ignoreWasSetByUser" : 1,
"ignore" : 1,
"ignoreWasSetByUser" : 0,
"ignore" : 0,
"hidden" : 0,
"outputPathIsSetByUser" : 0,
"inputAbbreviatedPath" : "\/source\/js\/lib\/jQuery\/easing.js",
@ -616,15 +629,6 @@
"outputAbbreviatedPath" : "No Output Path Set",
"fileType" : 8
},
"\/compiled\/index.html" : {
"ignoreWasSetByUser" : 0,
"ignore" : 0,
"hidden" : 0,
"outputPathIsSetByUser" : 0,
"inputAbbreviatedPath" : "\/compiled\/index.html",
"outputAbbreviatedPath" : "No Output Path Set",
"fileType" : 8
},
"\/compiled\/css\/timeline.png" : {
"ignoreWasSetByUser" : 0,
"ignore" : 0,
@ -655,21 +659,41 @@
"inputAbbreviatedPath" : "\/compiled\/js\/locale\/pt-br.js",
"outputStyle" : 1,
"syntaxCheckerStyle" : 0,
"outputAbbreviatedPath" : "\/locale\/pt-br-min.js",
"outputAbbreviatedPath" : "\/compiled\/js\/locale\/pt-br-min.js",
"fileType" : 5
},
"\/cdn\/timeline-cdn.js" : {
"ignoreWasSetByUser" : 0,
"ignore" : 1,
"hidden" : 0,
"outputPathIsSetByUser" : 0,
"inputAbbreviatedPath" : "\/cdn\/timeline-cdn.js",
"outputStyle" : 1,
"syntaxCheckerStyle" : 0,
"outputAbbreviatedPath" : "\/cdn\/timeline-cdn-min.js",
"fileType" : 5
},
"\/source\/less\/Variables.less" : {
"ignoreWasSetByUser" : 1,
"ignoreWasSetByUser" : 0,
"ignore" : 1,
"hidden" : 0,
"outputPathIsSetByUser" : 0,
"inputAbbreviatedPath" : "\/source\/less\/Variables.less",
"outputStyle" : 0,
"outputStyle" : 1,
"shouldRunBless" : 0,
"outputAbbreviatedPath" : "\/source\/css\/Variables.css",
"strictImports" : 0,
"fileType" : 0
},
"\/examples\/example_googlespreadsheet.html" : {
"ignoreWasSetByUser" : 0,
"ignore" : 0,
"hidden" : 0,
"outputPathIsSetByUser" : 0,
"inputAbbreviatedPath" : "\/examples\/example_googlespreadsheet.html",
"outputAbbreviatedPath" : "No Output Path Set",
"fileType" : 8
},
"\/dev_examples\/houston\/wh3.jpg" : {
"ignoreWasSetByUser" : 0,
"ignore" : 0,
@ -712,12 +736,12 @@
"outputAbbreviatedPath" : "\/compiled\/js\/locale\/fr.js",
"fileType" : 5
},
"\/examples\/template_googlespreadsheet\/index.html" : {
"\/cdn\/embed_test.html" : {
"ignoreWasSetByUser" : 0,
"ignore" : 0,
"hidden" : 0,
"outputPathIsSetByUser" : 0,
"inputAbbreviatedPath" : "\/examples\/template_googlespreadsheet\/index.html",
"inputAbbreviatedPath" : "\/cdn\/embed_test.html",
"outputAbbreviatedPath" : "No Output Path Set",
"fileType" : 8
},
@ -738,23 +762,12 @@
"hidden" : 0,
"outputPathIsSetByUser" : 0,
"inputAbbreviatedPath" : "\/source\/less\/Reset.less",
"outputStyle" : 0,
"outputStyle" : 1,
"shouldRunBless" : 0,
"outputAbbreviatedPath" : "\/source\/css\/Reset.css",
"strictImports" : 0,
"fileType" : 0
},
"\/source\/js\/VMM.TouchSlider.js" : {
"ignoreWasSetByUser" : 0,
"ignore" : 1,
"hidden" : 0,
"outputPathIsSetByUser" : 0,
"inputAbbreviatedPath" : "\/source\/js\/VMM.TouchSlider.js",
"outputStyle" : 1,
"syntaxCheckerStyle" : 0,
"outputAbbreviatedPath" : "\/source\/js\/VMM.TouchSlider-min.js",
"fileType" : 5
},
"\/source\/less\/Font\/PTSerif-PTSans.less" : {
"ignoreWasSetByUser" : 0,
"ignore" : 0,
@ -778,6 +791,17 @@
"initialSize" : 71002,
"fileType" : 9
},
"\/source\/js\/VMM.TouchSlider.js" : {
"ignoreWasSetByUser" : 0,
"ignore" : 1,
"hidden" : 0,
"outputPathIsSetByUser" : 0,
"inputAbbreviatedPath" : "\/source\/js\/VMM.TouchSlider.js",
"outputStyle" : 1,
"syntaxCheckerStyle" : 0,
"outputAbbreviatedPath" : "\/source\/js\/VMM.TouchSlider-min.js",
"fileType" : 5
},
"\/source\/js\/VMM.Timeline.License.js" : {
"ignoreWasSetByUser" : 0,
"ignore" : 1,
@ -798,15 +822,6 @@
"outputAbbreviatedPath" : "No Output Path Set",
"fileType" : 8
},
"\/examples\/language-example.html" : {
"ignoreWasSetByUser" : 0,
"ignore" : 0,
"hidden" : 0,
"outputPathIsSetByUser" : 0,
"inputAbbreviatedPath" : "\/examples\/language-example.html",
"outputAbbreviatedPath" : "No Output Path Set",
"fileType" : 8
},
"\/source\/js\/VMM.Library.js" : {
"ignoreWasSetByUser" : 0,
"ignore" : 1,
@ -841,6 +856,15 @@
"strictImports" : 0,
"fileType" : 0
},
"\/examples\/example_language.html" : {
"ignoreWasSetByUser" : 0,
"ignore" : 0,
"hidden" : 0,
"outputPathIsSetByUser" : 0,
"inputAbbreviatedPath" : "\/examples\/example_language.html",
"outputAbbreviatedPath" : "No Output Path Set",
"fileType" : 8
},
"\/source\/js\/VMM.MediaElement.js" : {
"ignoreWasSetByUser" : 0,
"ignore" : 1,
@ -897,14 +921,16 @@
"initialSize" : 103878,
"fileType" : 9
},
"\/examples\/template_html\/index.html" : {
"ignoreWasSetByUser" : 0,
"ignore" : 0,
"\/source\/js\/lib\/AES.js" : {
"ignoreWasSetByUser" : 1,
"ignore" : 1,
"hidden" : 0,
"outputPathIsSetByUser" : 0,
"inputAbbreviatedPath" : "\/examples\/template_html\/index.html",
"outputAbbreviatedPath" : "No Output Path Set",
"fileType" : 8
"inputAbbreviatedPath" : "\/source\/js\/lib\/AES.js",
"outputStyle" : 1,
"syntaxCheckerStyle" : 0,
"outputAbbreviatedPath" : "\/source\/js\/lib\/AES-min.js",
"fileType" : 5
},
"\/dev_examples\/kitchen-sink\/index.html" : {
"ignoreWasSetByUser" : 0,
@ -935,17 +961,6 @@
"outputAbbreviatedPath" : "\/source\/js\/VMM.MediaType-min.js",
"fileType" : 5
},
"\/source\/js\/lib\/AES.js" : {
"ignoreWasSetByUser" : 1,
"ignore" : 1,
"hidden" : 0,
"outputPathIsSetByUser" : 0,
"inputAbbreviatedPath" : "\/source\/js\/lib\/AES.js",
"outputStyle" : 1,
"syntaxCheckerStyle" : 0,
"outputAbbreviatedPath" : "\/source\/js\/lib\/AES-min.js",
"fileType" : 5
},
"\/source\/less\/Font\/Pacifico-Arimo.less" : {
"ignoreWasSetByUser" : 0,
"ignore" : 0,
@ -985,7 +1000,7 @@
"hidden" : 0,
"outputPathIsSetByUser" : 0,
"inputAbbreviatedPath" : "\/source\/less\/Mixins.less",
"outputStyle" : 0,
"outputStyle" : 1,
"shouldRunBless" : 0,
"outputAbbreviatedPath" : "\/source\/css\/Mixins.css",
"strictImports" : 0,
@ -1014,6 +1029,15 @@
"strictImports" : 0,
"fileType" : 0
},
"\/examples\/example_json.html" : {
"ignoreWasSetByUser" : 0,
"ignore" : 0,
"hidden" : 0,
"outputPathIsSetByUser" : 0,
"inputAbbreviatedPath" : "\/examples\/example_json.html",
"outputAbbreviatedPath" : "No Output Path Set",
"fileType" : 8
},
"\/compiled\/js\/timeline-embed.js" : {
"ignoreWasSetByUser" : 0,
"ignore" : 1,
@ -1022,7 +1046,7 @@
"inputAbbreviatedPath" : "\/compiled\/js\/timeline-embed.js",
"outputStyle" : 1,
"syntaxCheckerStyle" : 0,
"outputAbbreviatedPath" : "\/compiled\/timeline-embed-min.js",
"outputAbbreviatedPath" : "\/compiled\/js\/timeline-embed-min.js",
"fileType" : 5
},
"\/dev_examples\/taylor\/woolfe.jpg" : {
@ -1070,6 +1094,17 @@
"initialSize" : 85307,
"fileType" : 9
},
"\/source\/js\/VMM.js" : {
"ignoreWasSetByUser" : 0,
"ignore" : 1,
"hidden" : 0,
"outputPathIsSetByUser" : 0,
"inputAbbreviatedPath" : "\/source\/js\/VMM.js",
"outputStyle" : 1,
"syntaxCheckerStyle" : 0,
"outputAbbreviatedPath" : "\/source\/js\/VMM-min.js",
"fileType" : 5
},
"\/source\/js\/locale\/is.js" : {
"ignoreWasSetByUser" : 0,
"ignore" : 0,
@ -1081,15 +1116,6 @@
"outputAbbreviatedPath" : "\/compiled\/js\/locale\/is.js",
"fileType" : 5
},
"\/dev_examples\/republican\/index.html" : {
"ignoreWasSetByUser" : 0,
"ignore" : 0,
"hidden" : 0,
"outputPathIsSetByUser" : 0,
"inputAbbreviatedPath" : "\/dev_examples\/republican\/index.html",
"outputAbbreviatedPath" : "No Output Path Set",
"fileType" : 8
},
"\/dev_examples\/power-plants\/index.html" : {
"ignoreWasSetByUser" : 0,
"ignore" : 0,
@ -1131,16 +1157,17 @@
"strictImports" : 0,
"fileType" : 0
},
"\/source\/js\/VMM.Slider.js" : {
"\/source\/less\/Font\/Lekton-Molengo.less" : {
"ignoreWasSetByUser" : 0,
"ignore" : 1,
"ignore" : 0,
"hidden" : 0,
"outputPathIsSetByUser" : 0,
"inputAbbreviatedPath" : "\/source\/js\/VMM.Slider.js",
"outputPathIsSetByUser" : 1,
"inputAbbreviatedPath" : "\/source\/less\/Font\/Lekton-Molengo.less",
"outputStyle" : 1,
"syntaxCheckerStyle" : 0,
"outputAbbreviatedPath" : "\/source\/js\/VMM.Slider-min.js",
"fileType" : 5
"shouldRunBless" : 0,
"outputAbbreviatedPath" : "\/compiled\/css\/themes\/font\/Lekton-Molengo.css",
"strictImports" : 0,
"fileType" : 0
},
"\/source\/less\/Font\/BreeSerif-OpenSans.less" : {
"ignoreWasSetByUser" : 0,
@ -1154,17 +1181,14 @@
"strictImports" : 0,
"fileType" : 0
},
"\/source\/less\/Font\/Lekton-Molengo.less" : {
"\/dev_examples\/republican\/index.html" : {
"ignoreWasSetByUser" : 0,
"ignore" : 0,
"hidden" : 0,
"outputPathIsSetByUser" : 1,
"inputAbbreviatedPath" : "\/source\/less\/Font\/Lekton-Molengo.less",
"outputStyle" : 1,
"shouldRunBless" : 0,
"outputAbbreviatedPath" : "\/compiled\/css\/themes\/font\/Lekton-Molengo.css",
"strictImports" : 0,
"fileType" : 0
"outputPathIsSetByUser" : 0,
"inputAbbreviatedPath" : "\/dev_examples\/republican\/index.html",
"outputAbbreviatedPath" : "No Output Path Set",
"fileType" : 8
},
"\/dev_examples\/taylor\/dame.jpg" : {
"ignoreWasSetByUser" : 0,
@ -1177,17 +1201,26 @@
"initialSize" : 108781,
"fileType" : 9
},
"\/source\/js\/VMM.js" : {
"\/source\/js\/VMM.Slider.js" : {
"ignoreWasSetByUser" : 0,
"ignore" : 1,
"hidden" : 0,
"outputPathIsSetByUser" : 0,
"inputAbbreviatedPath" : "\/source\/js\/VMM.js",
"inputAbbreviatedPath" : "\/source\/js\/VMM.Slider.js",
"outputStyle" : 1,
"syntaxCheckerStyle" : 0,
"outputAbbreviatedPath" : "\/source\/js\/VMM-min.js",
"outputAbbreviatedPath" : "\/source\/js\/VMM.Slider-min.js",
"fileType" : 5
},
"\/cdn\/index.html" : {
"ignoreWasSetByUser" : 0,
"ignore" : 0,
"hidden" : 0,
"outputPathIsSetByUser" : 0,
"inputAbbreviatedPath" : "\/cdn\/index.html",
"outputAbbreviatedPath" : "No Output Path Set",
"fileType" : 8
},
"\/source\/less\/VMM.Slider.less" : {
"ignoreWasSetByUser" : 0,
"ignore" : 1,
@ -1220,6 +1253,26 @@
"outputAbbreviatedPath" : "\/compiled\/js\/timeline-min.js",
"fileType" : 5
},
"\/dev_examples\/iframe.html" : {
"ignoreWasSetByUser" : 0,
"ignore" : 0,
"hidden" : 0,
"outputPathIsSetByUser" : 0,
"inputAbbreviatedPath" : "\/dev_examples\/iframe.html",
"outputAbbreviatedPath" : "No Output Path Set",
"fileType" : 8
},
"\/source\/js\/locale\/pt-br.js" : {
"ignoreWasSetByUser" : 0,
"ignore" : 0,
"hidden" : 0,
"outputPathIsSetByUser" : 1,
"inputAbbreviatedPath" : "\/source\/js\/locale\/pt-br.js",
"outputStyle" : 1,
"syntaxCheckerStyle" : 0,
"outputAbbreviatedPath" : "\/compiled\/js\/locale\/pt-br.js",
"fileType" : 5
},
"\/dev_examples\/power-plants\/fisk_pauldailingmedill.jpg" : {
"ignoreWasSetByUser" : 0,
"ignore" : 0,
@ -1243,17 +1296,6 @@
"strictImports" : 0,
"fileType" : 0
},
"\/source\/js\/locale\/pt-br.js" : {
"ignoreWasSetByUser" : 0,
"ignore" : 0,
"hidden" : 0,
"outputPathIsSetByUser" : 1,
"inputAbbreviatedPath" : "\/source\/js\/locale\/pt-br.js",
"outputStyle" : 1,
"syntaxCheckerStyle" : 0,
"outputAbbreviatedPath" : "\/compiled\/js\/locale\/pt-br.js",
"fileType" : 5
},
"\/source\/js\/VMM.ExternalAPI.js" : {
"ignoreWasSetByUser" : 0,
"ignore" : 1,
@ -1285,7 +1327,7 @@
"inputAbbreviatedPath" : "\/compiled\/js\/locale\/kr.js",
"outputStyle" : 1,
"syntaxCheckerStyle" : 0,
"outputAbbreviatedPath" : "\/locale\/kr-min.js",
"outputAbbreviatedPath" : "\/compiled\/js\/locale\/kr-min.js",
"fileType" : 5
},
"\/compiled\/js\/locale\/nl.js" : {
@ -1296,7 +1338,7 @@
"inputAbbreviatedPath" : "\/compiled\/js\/locale\/nl.js",
"outputStyle" : 1,
"syntaxCheckerStyle" : 0,
"outputAbbreviatedPath" : "\/locale\/nl-min.js",
"outputAbbreviatedPath" : "\/compiled\/js\/locale\/nl-min.js",
"fileType" : 5
},
"\/compiled\/js\/locale\/en.js" : {
@ -1307,7 +1349,7 @@
"inputAbbreviatedPath" : "\/compiled\/js\/locale\/en.js",
"outputStyle" : 1,
"syntaxCheckerStyle" : 0,
"outputAbbreviatedPath" : "\/locale\/en-min.js",
"outputAbbreviatedPath" : "\/compiled\/js\/locale\/en-min.js",
"fileType" : 5
},
"\/source\/less\/Font\/Bevan-PotanoSans.less" : {
@ -1322,27 +1364,27 @@
"strictImports" : 0,
"fileType" : 0
},
"\/compiled\/js\/locale\/fr.js" : {
"\/compiled\/js\/locale\/es.js" : {
"ignoreWasSetByUser" : 0,
"ignore" : 1,
"hidden" : 0,
"outputPathIsSetByUser" : 0,
"inputAbbreviatedPath" : "\/compiled\/js\/locale\/fr.js",
"inputAbbreviatedPath" : "\/compiled\/js\/locale\/es.js",
"outputStyle" : 1,
"syntaxCheckerStyle" : 0,
"outputAbbreviatedPath" : "\/locale\/fr-min.js",
"outputAbbreviatedPath" : "\/compiled\/js\/locale\/es-min.js",
"fileType" : 5
},
"\/compiled\/css\/themes\/timeline-dark.png" : {
"\/compiled\/js\/locale\/fr.js" : {
"ignoreWasSetByUser" : 0,
"ignore" : 0,
"ignore" : 1,
"hidden" : 0,
"outputPathIsSetByUser" : 0,
"inputAbbreviatedPath" : "\/compiled\/css\/themes\/timeline-dark.png",
"processed" : 0,
"outputAbbreviatedPath" : "\/compiled\/css\/themes\/timeline-dark.png",
"initialSize" : 8862,
"fileType" : 10
"inputAbbreviatedPath" : "\/compiled\/js\/locale\/fr.js",
"outputStyle" : 1,
"syntaxCheckerStyle" : 0,
"outputAbbreviatedPath" : "\/compiled\/js\/locale\/fr-min.js",
"fileType" : 5
},
"\/compiled\/js\/locale\/zh-tw.js" : {
"ignoreWasSetByUser" : 0,
@ -1352,74 +1394,74 @@
"inputAbbreviatedPath" : "\/compiled\/js\/locale\/zh-tw.js",
"outputStyle" : 1,
"syntaxCheckerStyle" : 0,
"outputAbbreviatedPath" : "\/locale\/zh-tw-min.js",
"outputAbbreviatedPath" : "\/compiled\/js\/locale\/zh-tw-min.js",
"fileType" : 5
},
"\/compiled\/js\/locale\/is.js" : {
"\/compiled\/css\/themes\/timeline-dark.png" : {
"ignoreWasSetByUser" : 0,
"ignore" : 1,
"ignore" : 0,
"hidden" : 0,
"outputPathIsSetByUser" : 0,
"inputAbbreviatedPath" : "\/compiled\/js\/locale\/is.js",
"outputStyle" : 1,
"syntaxCheckerStyle" : 0,
"outputAbbreviatedPath" : "\/locale\/is-min.js",
"fileType" : 5
"inputAbbreviatedPath" : "\/compiled\/css\/themes\/timeline-dark.png",
"processed" : 0,
"outputAbbreviatedPath" : "\/compiled\/css\/themes\/timeline-dark.png",
"initialSize" : 8862,
"fileType" : 10
},
"\/source\/less\/Font\/SansitaOne-Kameron.less" : {
"\/source\/js\/locale\/kr.js" : {
"ignoreWasSetByUser" : 0,
"ignore" : 0,
"hidden" : 0,
"outputPathIsSetByUser" : 1,
"inputAbbreviatedPath" : "\/source\/less\/Font\/SansitaOne-Kameron.less",
"inputAbbreviatedPath" : "\/source\/js\/locale\/kr.js",
"outputStyle" : 1,
"shouldRunBless" : 0,
"outputAbbreviatedPath" : "\/compiled\/css\/themes\/font\/SansitaOne-Kameron.css",
"strictImports" : 0,
"fileType" : 0
"syntaxCheckerStyle" : 0,
"outputAbbreviatedPath" : "\/compiled\/js\/locale\/kr.js",
"fileType" : 5
},
"\/compiled\/js\/locale\/it.js" : {
"\/compiled\/js\/locale\/is.js" : {
"ignoreWasSetByUser" : 0,
"ignore" : 1,
"hidden" : 0,
"outputPathIsSetByUser" : 0,
"inputAbbreviatedPath" : "\/compiled\/js\/locale\/it.js",
"inputAbbreviatedPath" : "\/compiled\/js\/locale\/is.js",
"outputStyle" : 1,
"syntaxCheckerStyle" : 0,
"outputAbbreviatedPath" : "\/locale\/it-min.js",
"outputAbbreviatedPath" : "\/compiled\/js\/locale\/is-min.js",
"fileType" : 5
},
"\/source\/js\/VMM.Language.js" : {
"\/compiled\/js\/locale\/it.js" : {
"ignoreWasSetByUser" : 0,
"ignore" : 1,
"hidden" : 0,
"outputPathIsSetByUser" : 0,
"inputAbbreviatedPath" : "\/source\/js\/VMM.Language.js",
"inputAbbreviatedPath" : "\/compiled\/js\/locale\/it.js",
"outputStyle" : 1,
"syntaxCheckerStyle" : 0,
"outputAbbreviatedPath" : "\/source\/js\/VMM.Language-min.js",
"outputAbbreviatedPath" : "\/compiled\/js\/locale\/it-min.js",
"fileType" : 5
},
"\/source\/js\/locale\/kr.js" : {
"\/source\/less\/Font\/SansitaOne-Kameron.less" : {
"ignoreWasSetByUser" : 0,
"ignore" : 0,
"hidden" : 0,
"outputPathIsSetByUser" : 1,
"inputAbbreviatedPath" : "\/source\/js\/locale\/kr.js",
"inputAbbreviatedPath" : "\/source\/less\/Font\/SansitaOne-Kameron.less",
"outputStyle" : 1,
"syntaxCheckerStyle" : 0,
"outputAbbreviatedPath" : "\/compiled\/js\/locale\/kr.js",
"fileType" : 5
"shouldRunBless" : 0,
"outputAbbreviatedPath" : "\/compiled\/css\/themes\/font\/SansitaOne-Kameron.css",
"strictImports" : 0,
"fileType" : 0
},
"\/compiled\/js\/locale\/de.js" : {
"\/source\/js\/VMM.Language.js" : {
"ignoreWasSetByUser" : 0,
"ignore" : 1,
"hidden" : 0,
"outputPathIsSetByUser" : 0,
"inputAbbreviatedPath" : "\/compiled\/js\/locale\/de.js",
"inputAbbreviatedPath" : "\/source\/js\/VMM.Language.js",
"outputStyle" : 1,
"syntaxCheckerStyle" : 0,
"outputAbbreviatedPath" : "\/locale\/de-min.js",
"outputAbbreviatedPath" : "\/source\/js\/VMM.Language-min.js",
"fileType" : 5
},
"\/source\/js\/locale\/zh-ch.js" : {
@ -1456,6 +1498,15 @@
"strictImports" : 0,
"fileType" : 0
},
"\/examples\/example_html.html" : {
"ignoreWasSetByUser" : 0,
"ignore" : 0,
"hidden" : 0,
"outputPathIsSetByUser" : 0,
"inputAbbreviatedPath" : "\/examples\/example_html.html",
"outputAbbreviatedPath" : "No Output Path Set",
"fileType" : 8
},
"\/dev_examples\/power-plants\/fisk_greenpeaceusa2012.jpg" : {
"ignoreWasSetByUser" : 0,
"ignore" : 0,
@ -1467,17 +1518,6 @@
"initialSize" : 77211,
"fileType" : 9
},
"\/compiled\/js\/locale\/es.js" : {
"ignoreWasSetByUser" : 0,
"ignore" : 1,
"hidden" : 0,
"outputPathIsSetByUser" : 0,
"inputAbbreviatedPath" : "\/compiled\/js\/locale\/es.js",
"outputStyle" : 1,
"syntaxCheckerStyle" : 0,
"outputAbbreviatedPath" : "\/locale\/es-min.js",
"fileType" : 5
},
"\/dev_examples\/taylor\/fisher.jpg" : {
"ignoreWasSetByUser" : 0,
"ignore" : 0,
@ -1498,6 +1538,17 @@
"outputAbbreviatedPath" : "No Output Path Set",
"fileType" : 8
},
"\/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" : 5
},
"\/source\/js\/lib\/Embed.LoadLib.js" : {
"ignoreWasSetByUser" : 1,
"ignore" : 1,
@ -1529,17 +1580,6 @@
"outputAbbreviatedPath" : "\/compiled\/css\/themes\/font\/Rancho-Gudea.css",
"strictImports" : 0,
"fileType" : 0
},
"\/source\/js\/locale\/ja.js" : {
"ignoreWasSetByUser" : 0,
"ignore" : 0,
"hidden" : 0,
"outputPathIsSetByUser" : 1,
"inputAbbreviatedPath" : "\/source\/js\/locale\/ja.js",
"outputStyle" : 1,
"syntaxCheckerStyle" : 0,
"outputAbbreviatedPath" : "\/locale\/ja.js",
"fileType" : 5
}
},
"manualImportLinks" : [
@ -1547,14 +1587,14 @@
"type" : 0,
"position" : 0,
"linkedFileAbbreviatedPath" : "\/source\/js\/VMM.Timeline.js",
"baseFileAbbreviatedPath" : "\/source\/js\/locale\/de.js",
"baseFileAbbreviatedPath" : "\/source\/js\/locale\/nl.js",
"followForSyntaxChecking" : 1
},
{
"type" : 0,
"position" : 0,
"linkedFileAbbreviatedPath" : "\/source\/js\/lib\/Embed.LoadLib.js",
"baseFileAbbreviatedPath" : "\/source\/js\/timeline-embed.js",
"linkedFileAbbreviatedPath" : "\/source\/js\/VMM.Timeline.js",
"baseFileAbbreviatedPath" : "\/source\/js\/locale\/zh-tw.js",
"followForSyntaxChecking" : 1
},
{
@ -1568,21 +1608,21 @@
"type" : 0,
"position" : 0,
"linkedFileAbbreviatedPath" : "\/source\/js\/VMM.Timeline.js",
"baseFileAbbreviatedPath" : "\/source\/js\/locale\/nl.js",
"baseFileAbbreviatedPath" : "\/source\/js\/locale\/pt-br.js",
"followForSyntaxChecking" : 1
},
{
"type" : 0,
"position" : 0,
"linkedFileAbbreviatedPath" : "\/source\/js\/VMM.Timeline.js",
"baseFileAbbreviatedPath" : "\/source\/js\/locale\/zh-ch.js",
"baseFileAbbreviatedPath" : "\/source\/js\/locale\/it.js",
"followForSyntaxChecking" : 1
},
{
"type" : 0,
"position" : 0,
"linkedFileAbbreviatedPath" : "\/source\/js\/VMM.Timeline.js",
"baseFileAbbreviatedPath" : "\/source\/js\/locale\/es.js",
"position" : 1,
"linkedFileAbbreviatedPath" : "\/source\/js\/lib\/Embed.LoadLib.js",
"baseFileAbbreviatedPath" : "\/source\/js\/timeline-embed.js",
"followForSyntaxChecking" : 1
},
{
@ -1596,42 +1636,35 @@
"type" : 0,
"position" : 0,
"linkedFileAbbreviatedPath" : "\/source\/js\/VMM.Timeline.js",
"baseFileAbbreviatedPath" : "\/source\/js\/locale\/it.js",
"followForSyntaxChecking" : 1
},
{
"type" : 0,
"position" : 0,
"linkedFileAbbreviatedPath" : "\/source\/js\/VMM.Timeline.js",
"baseFileAbbreviatedPath" : "\/source\/js\/locale\/en.js",
"baseFileAbbreviatedPath" : "\/source\/js\/locale\/kr.js",
"followForSyntaxChecking" : 1
},
{
"type" : 0,
"position" : 0,
"linkedFileAbbreviatedPath" : "\/source\/js\/VMM.Timeline.js",
"baseFileAbbreviatedPath" : "\/source\/js\/locale\/zh-tw.js",
"baseFileAbbreviatedPath" : "\/source\/js\/locale\/zh-ch.js",
"followForSyntaxChecking" : 1
},
{
"type" : 0,
"position" : 0,
"linkedFileAbbreviatedPath" : "\/source\/js\/VMM.Timeline.js",
"baseFileAbbreviatedPath" : "\/source\/js\/locale\/kr.js",
"baseFileAbbreviatedPath" : "\/source\/js\/locale\/es.js",
"followForSyntaxChecking" : 1
},
{
"type" : 0,
"position" : 0,
"linkedFileAbbreviatedPath" : "\/source\/js\/VMM.Timeline.js",
"baseFileAbbreviatedPath" : "\/source\/js\/locale\/pt-br.js",
"baseFileAbbreviatedPath" : "\/source\/js\/locale\/en.js",
"followForSyntaxChecking" : 1
},
{
"type" : 0,
"position" : 0,
"linkedFileAbbreviatedPath" : "\/source\/js\/VMM.Timeline.js",
"baseFileAbbreviatedPath" : "\/source\/js\/locale\/ja.js",
"baseFileAbbreviatedPath" : "\/source\/js\/locale\/de.js",
"followForSyntaxChecking" : 1
}
],
@ -1695,8 +1728,8 @@
"evil" : 0,
"strict" : 0,
"multistr" : 0,
"wsh" : 0,
"couch" : 0,
"wsh" : 0,
"laxbreak" : 0,
"rhino" : 0,
"globalstrict" : 0,
@ -1714,8 +1747,8 @@
"newcap" : 0,
"forin" : 0,
"regexdash" : 0,
"node" : 0,
"browser" : 1,
"node" : 0,
"eqnull" : 1,
"mootools" : 0,
"iterator" : 0,

2
compiled/js/locale/zh-ch.js
View File

File diff suppressed because one or more lines are too long

3
compiled/js/timeline.js
Unescape View File

@ -6030,10 +6030,7 @@ if(typeof VMM != 'undefined' && typeof VMM.Timeline == 'undefined') {
_date.fulldate = _date.startdate.getTime();
_date.text = data.date[i].text;
_date.content = "";
<<<<<<< HEAD:timeline.js
=======
>>>>>>> Canary:compiled/js/timeline.js
_dates.push(_date);

32
locale/de.js
View File

File diff suppressed because one or more lines are too long

32
locale/en.js
View File

File diff suppressed because one or more lines are too long

32
locale/es.js
View File

File diff suppressed because one or more lines are too long

32
locale/fr.js
View File

File diff suppressed because one or more lines are too long

32
locale/is.js
View File

File diff suppressed because one or more lines are too long

32
locale/it.js
View File

File diff suppressed because one or more lines are too long

32
locale/kr.js
View File

File diff suppressed because one or more lines are too long

32
locale/nl.js
View File

File diff suppressed because one or more lines are too long

32
locale/pt-br.js
View File

File diff suppressed because one or more lines are too long

32
locale/zh-ch.js
View File

File diff suppressed because one or more lines are too long

32
locale/zh-tw.js
View File

File diff suppressed because one or more lines are too long

3
source/js/VMM.Timeline.js
Unescape View File

@ -454,10 +454,7 @@ if(typeof VMM != 'undefined' && typeof VMM.Timeline == 'undefined') {
_date.fulldate = _date.startdate.getTime();
_date.text = data.date[i].text;
_date.content = "";
<<<<<<< HEAD
=======
>>>>>>> Canary
_dates.push(_date);

2
source/js/locale/zh-ch.js
Unescape View File

@ -28,4 +28,4 @@ if(typeof VMM != 'undefined') {
contract_timeline: "缩短时间"
}
}
}
}
Write Preview
Loading…
Cancel
Save