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

Support for source with other parameters in the url construct closes #239 closes #281 closes #251

pull/345/head
Zach Wise 12 years ago
parent
d91cc84f98
commit
6c41ba68f4
4 changed files with 62 additions and 39 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. 81
      codekit-config.json
  2. 4
      compiled/js/timeline-min.js
  3. 8
      compiled/js/timeline.js
  4. 8
      source/js/VMM.Timeline.DataObj.js

81
codekit-config.json
Unescape View File

@ -200,18 +200,16 @@
"outputAbbreviatedPath" : "No Output Path",
"fileType" : 2048
},
"\/source\/less\/Core\/Font\/AbrilFatface-Average.less" : {
"\/source\/js\/Core\/Language\/locale\/fo.js" : {
"ignoreWasSetByUser" : 0,
"ignore" : 0,
"hidden" : 0,
"outputPathIsSetByUser" : 0,
"inputAbbreviatedPath" : "\/source\/less\/Core\/Font\/AbrilFatface-Average.less",
"outputPathIsSetByUser" : 1,
"inputAbbreviatedPath" : "\/source\/js\/Core\/Language\/locale\/fo.js",
"outputStyle" : 1,
"shouldRunBless" : 0,
"outputAbbreviatedPath" : "\/source\/less\/Core\/css\/AbrilFatface-Average.css",
"strictImports" : 0,
"fileType" : 1,
"debugStyle" : 0
"syntaxCheckerStyle" : 0,
"outputAbbreviatedPath" : "\/compiled\/js\/locale\/fo.js",
"fileType" : 64
},
"\/source\/jade\/sections\/example-head.jade" : {
"ignoreWasSetByUser" : 0,
@ -255,16 +253,18 @@
"outputAbbreviatedPath" : "No Output Path",
"fileType" : 2048
},
"\/source\/js\/Core\/Language\/locale\/fo.js" : {
"\/source\/less\/Core\/Font\/AbrilFatface-Average.less" : {
"ignoreWasSetByUser" : 0,
"ignore" : 0,
"hidden" : 0,
"outputPathIsSetByUser" : 1,
"inputAbbreviatedPath" : "\/source\/js\/Core\/Language\/locale\/fo.js",
"outputPathIsSetByUser" : 0,
"inputAbbreviatedPath" : "\/source\/less\/Core\/Font\/AbrilFatface-Average.less",
"outputStyle" : 1,
"syntaxCheckerStyle" : 0,
"outputAbbreviatedPath" : "\/compiled\/js\/locale\/fo.js",
"fileType" : 64
"shouldRunBless" : 0,
"outputAbbreviatedPath" : "\/source\/less\/Core\/css\/AbrilFatface-Average.css",
"strictImports" : 0,
"fileType" : 1,
"debugStyle" : 0
},
"\/dev_examples\/taylor\/fisher.jpg" : {
"ignoreWasSetByUser" : 0,
@ -612,17 +612,6 @@
"outputAbbreviatedPath" : "No Output Path",
"fileType" : 2048
},
"\/dev_examples\/taylor\/broadway.jpg" : {
"ignoreWasSetByUser" : 0,
"ignore" : 0,
"hidden" : 0,
"outputPathIsSetByUser" : 0,
"inputAbbreviatedPath" : "\/dev_examples\/taylor\/broadway.jpg",
"processed" : 0,
"outputAbbreviatedPath" : "\/dev_examples\/taylor\/broadway.jpg",
"initialSize" : 111700,
"fileType" : 4096
},
"\/source\/js\/Core\/Media\/VMM.MediaType.js" : {
"ignoreWasSetByUser" : 0,
"ignore" : 1,
@ -634,6 +623,17 @@
"outputAbbreviatedPath" : "\/source\/js\/Core\/Media\/VMM.MediaType-min.js",
"fileType" : 64
},
"\/dev_examples\/taylor\/broadway.jpg" : {
"ignoreWasSetByUser" : 0,
"ignore" : 0,
"hidden" : 0,
"outputPathIsSetByUser" : 0,
"inputAbbreviatedPath" : "\/dev_examples\/taylor\/broadway.jpg",
"processed" : 0,
"outputAbbreviatedPath" : "\/dev_examples\/taylor\/broadway.jpg",
"initialSize" : 111700,
"fileType" : 4096
},
"\/compiled\/css\/themes\/font\/Georgia-Helvetica.css" : {
"ignoreWasSetByUser" : 0,
"ignore" : 1,
@ -1596,26 +1596,26 @@
"outputAbbreviatedPath" : "No Output Path",
"fileType" : 16
},
"\/dev_examples\/houston\/whlead.jpg" : {
"\/dev_examples\/taylor\/velvet.jpg" : {
"ignoreWasSetByUser" : 0,
"ignore" : 0,
"hidden" : 0,
"outputPathIsSetByUser" : 0,
"inputAbbreviatedPath" : "\/dev_examples\/houston\/whlead.jpg",
"inputAbbreviatedPath" : "\/dev_examples\/taylor\/velvet.jpg",
"processed" : 0,
"outputAbbreviatedPath" : "\/dev_examples\/houston\/whlead.jpg",
"initialSize" : 97988,
"outputAbbreviatedPath" : "\/dev_examples\/taylor\/velvet.jpg",
"initialSize" : 77001,
"fileType" : 4096
},
"\/dev_examples\/taylor\/velvet.jpg" : {
"\/dev_examples\/houston\/whlead.jpg" : {
"ignoreWasSetByUser" : 0,
"ignore" : 0,
"hidden" : 0,
"outputPathIsSetByUser" : 0,
"inputAbbreviatedPath" : "\/dev_examples\/taylor\/velvet.jpg",
"inputAbbreviatedPath" : "\/dev_examples\/houston\/whlead.jpg",
"processed" : 0,
"outputAbbreviatedPath" : "\/dev_examples\/taylor\/velvet.jpg",
"initialSize" : 77001,
"outputAbbreviatedPath" : "\/dev_examples\/houston\/whlead.jpg",
"initialSize" : 97988,
"fileType" : 4096
},
"\/source\/js\/Core\/Library\/bootstrap-tooltip.js" : {
@ -1836,11 +1836,11 @@
"ignoreWasSetByUser" : 0,
"ignore" : 0,
"hidden" : 0,
"outputPathIsSetByUser" : 0,
"outputPathIsSetByUser" : 1,
"inputAbbreviatedPath" : "\/source\/js\/Core\/Language\/locale\/ko.js",
"outputStyle" : 1,
"syntaxCheckerStyle" : 0,
"outputAbbreviatedPath" : "\/source\/js\/Core\/Language\/locale\/ko-min.js",
"outputAbbreviatedPath" : "\/compiled\/js\/locale\/ko.js",
"fileType" : 64
},
"\/source\/less\/Core\/Font\/Rancho-Gudea.less" : {
@ -2127,6 +2127,17 @@
"outputAbbreviatedPath" : "\/compiled\/js\/locale\/zh-cn.js",
"fileType" : 64
},
"\/compiled\/js\/locale\/ko.js" : {
"ignoreWasSetByUser" : 0,
"ignore" : 1,
"hidden" : 0,
"outputPathIsSetByUser" : 0,
"inputAbbreviatedPath" : "\/compiled\/js\/locale\/ko.js",
"outputStyle" : 1,
"syntaxCheckerStyle" : 0,
"outputAbbreviatedPath" : "\/compiled\/js\/locale\/ko-min.js",
"fileType" : 64
},
"\/dev_examples\/power-plants\/fisk_pauldailingmedill.jpg" : {
"ignoreWasSetByUser" : 0,
"ignore" : 0,

4
compiled/js/timeline-min.js vendored
View File

File diff suppressed because one or more lines are too long

8
compiled/js/timeline.js
Unescape View File

@ -9125,7 +9125,13 @@ if (typeof VMM.Timeline !== 'undefined' && typeof VMM.Timeline.DataObj == 'undef
LoadLib.js(raw_data, VMM.Timeline.DataObj.onJSONPLoaded);
} else {
trace("DATA SOURCE: JSON");
VMM.getJSON(raw_data + "?callback=onJSONP_Data", VMM.Timeline.DataObj.parseJSON);
var req = "";
if (raw_data.indexOf("?") > -1) {
req = raw_data + "&callback=onJSONP_Data";
} else {
req = raw_data + "?callback=onJSONP_Data";
}
VMM.getJSON(req, VMM.Timeline.DataObj.parseJSON);
}
} else if (type.of(raw_data) == "html") {
trace("DATA SOURCE: HTML");

8
source/js/VMM.Timeline.DataObj.js
Unescape View File

@ -27,7 +27,13 @@ if (typeof VMM.Timeline !== 'undefined' && typeof VMM.Timeline.DataObj == 'undef
LoadLib.js(raw_data, VMM.Timeline.DataObj.onJSONPLoaded);
} else {
trace("DATA SOURCE: JSON");
VMM.getJSON(raw_data + "?callback=onJSONP_Data", VMM.Timeline.DataObj.parseJSON);
var req = "";
if (raw_data.indexOf("?") > -1) {
req = raw_data + "&callback=onJSONP_Data";
} else {
req = raw_data + "?callback=onJSONP_Data";
}
VMM.getJSON(req, VMM.Timeline.DataObj.parseJSON);
}
} else if (type.of(raw_data) == "html") {
trace("DATA SOURCE: HTML");

Write Preview
Loading…
Cancel
Save