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

fixed a bug when no startpage is defined, cleaned up i18n example

pull/12/head
Martin Widmann 13 years ago
parent
3c33aa12bf
commit
41c12c1bbc
3 changed files with 12 additions and 9 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      examples/i18n_example/index.html
  2. 5
      source/js/timeline.js
  3. 2
      timeline-min.js

14
examples/i18n_example/index.html
Unescape View File

@ -22,9 +22,7 @@
-webkit-box-shadow:0 0px 0px rgba(0, 0, 0, 0.25) !important; -webkit-box-shadow:0 0px 0px rgba(0, 0, 0, 0.25) !important;
box-shadow:0px 0px 0px rgba(0, 0, 0, 0.25) !important; box-shadow:0px 0px 0px rgba(0, 0, 0, 0.25) !important;
} }
</style> </style>
</head> </head>
<body> <body>
@ -34,9 +32,9 @@
var config = { var config = {
width: "100%", width: "100%",
height: "100%", height: "100%",
source: 'https://docs.google.com/spreadsheet/pub?key=0AsTYTZtQh7kpdFhXamZFMEcxaXp0aGY5UE5PcUliU2c&output=html', source: 'https://docs.google.com/spreadsheet/pub?key=0AsTYTZtQh7kpdEUzM1NVWkhSV3dlSXRITmJremRKUWc&output=html',
// comment next line for debugging
js: '../../timeline-min.js' js: '../../timeline-min.js'
// uncomment next line for debugging // uncomment next line for debugging
//js: ['../../source/js/date-format.js', '../../source/js/VMM.js', '../../source/js/VMM.Core.js', '../../source/js/VMM.Util.js', '../../source/js/VMM.LoadLib.js', '../../source/js/bootstrap-tooltip.js', '../../source/js/AES.js', '../../source/js/timeline.js'] //js: ['../../source/js/date-format.js', '../../source/js/VMM.js', '../../source/js/VMM.Core.js', '../../source/js/VMM.Util.js', '../../source/js/VMM.LoadLib.js', '../../source/js/bootstrap-tooltip.js', '../../source/js/AES.js', '../../source/js/timeline.js']
} }
@ -67,9 +65,15 @@
unsupported_ie7: "Internet Explorer 7 wird von Timeline nicht unterstützt." unsupported_ie7: "Internet Explorer 7 wird von Timeline nicht unterstützt."
} }
}; };
</script> </script>
<!-- comment next line for debugging -->
<script type="text/javascript" src="../../timeline-embed.js"></script> <script type="text/javascript" src="../../timeline-embed.js"></script>
<!-- uncomment next two lines for debugging -->
<!--
<script type="text/javascript" src="../../source/js/lazyload.js"></script>
<script type="text/javascript" src="../../source/js/timeline-embed.js"></script>
-->
<!-- END Timeline Embed --> <!-- END Timeline Embed -->
</body> </body>
</html> </html>

5
source/js/timeline.js
Unescape View File

@ -1702,13 +1702,12 @@ if(typeof VMM != 'undefined' && typeof VMM.Timeline == 'undefined') {
VMM.bindEvent(".back-home", onBackHome, "click"); VMM.bindEvent(".back-home", onBackHome, "click");
VMM.Element.css($toolbar, "top", 27); VMM.Element.css($toolbar, "top", 27);
VMM.Element.attribute($backhome, "title", VMM.master_config.i18n.messages.return_to_title);
VMM.Element.attribute($backhome, "rel", "tooltip");
} }
$zoomin = VMM.appendAndGetElement($toolbar, "<div>", "zoom-in", "<div class='icon'></div>"); $zoomin = VMM.appendAndGetElement($toolbar, "<div>", "zoom-in", "<div class='icon'></div>");
$zoomout = VMM.appendAndGetElement($toolbar, "<div>", "zoom-out", "<div class='icon'></div>"); $zoomout = VMM.appendAndGetElement($toolbar, "<div>", "zoom-out", "<div class='icon'></div>");
VMM.Element.attribute($backhome, "title", VMM.master_config.i18n.messages.return_to_title);
VMM.Element.attribute($backhome, "rel", "tooltip");
VMM.Element.attribute($zoomin, "title", VMM.master_config.i18n.messages.expand_timeline); VMM.Element.attribute($zoomin, "title", VMM.master_config.i18n.messages.expand_timeline);
VMM.Element.attribute($zoomin, "rel", "tooltip"); VMM.Element.attribute($zoomin, "rel", "tooltip");

2
timeline-min.js vendored
View File

File diff suppressed because one or more lines are too long
Write Preview
Loading…
Cancel
Save