Skip to content

Commit

Permalink
Release 0.1.7
Browse files Browse the repository at this point in the history
  • Loading branch information
JoeGermuska committed Dec 22, 2013
1 parent 5beabfd commit 0a8b866
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 13 deletions.
2 changes: 1 addition & 1 deletion build/css/storymap.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 3 additions & 4 deletions build/embed/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
<meta name="apple-touch-fullscreen" content="yes">
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
<link rel="stylesheet" href="http://cdn.knightlab.com/libs/storymapjs/latest/css/storymap.css">
<link rel="stylesheet" href="http://cdn.knightlab.com/libs/storymapjs/latest/css/fonts/font.default.css">
<script type="text/javascript" src="http://cdn.knightlab.com/libs/storymapjs/latest/js/storymap-min.js"></script>
<style>
html, body {
Expand Down Expand Up @@ -100,20 +99,20 @@
if(d.storymap.language) {
options.language = d.storymap.language;
}
/*

var font = "stock:default";
if(d.font_css) {
font = d.font_css;
}
if(font.startsWith("stock:")) {
if(font.indexOf("stock:") == 0) {
var font_name = font.split(':')[1];
var base_url = url_join(options.script_path,"../css/fonts/");
font = url_join(base_url, "font." + font_name + ".css");
} else if(!(font.startsWith('http') || font.startsWith('//'))) {
font = url_join(options.script_path, font);
}
VCO.Load.css(font,function(){ trace('font loaded: ' + font);});
*/



storymap = new VCO.StoryMap('storymap-embed', d, options);
Expand Down
14 changes: 7 additions & 7 deletions build/js/storymap-min.js

Large diffs are not rendered by default.

14 changes: 13 additions & 1 deletion build/js/storymap.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* storymapjs - v0.1.6 - 2013-12-20
/* storymapjs - v0.1.7 - 2013-12-22
* Copyright (c) 2013 Northwestern University Knight Lab
*/

Expand Down Expand Up @@ -4730,6 +4730,10 @@ VCO.Media.Blockquote = VCO.Media.extend({
this.onLoaded();
},

updateMediaDisplay: function() {

},

_updateMediaDisplay: function() {

}
Expand Down Expand Up @@ -5288,6 +5292,10 @@ VCO.Media.Twitter = VCO.Media.extend({

},

updateMediaDisplay: function() {

},

_updateMediaDisplay: function() {

}
Expand Down Expand Up @@ -5601,6 +5609,10 @@ VCO.Media.Wikipedia = VCO.Media.extend({

},

updateMediaDisplay: function() {

},

_updateMediaDisplay: function() {

}
Expand Down

0 comments on commit 0a8b866

Please sign in to comment.