Skip to content

Commit

Permalink
Update spreadsheet test example to include debug
Browse files Browse the repository at this point in the history
  • Loading branch information
zachwise committed Oct 9, 2015
1 parent 27f1079 commit d25de69
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 9 deletions.
1 change: 1 addition & 0 deletions compiled/examples/google_spreadsheet_tester.html
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@
document.getElementById('timeline').style.height = (window.innerHeight - 40 + "px");

timeline = new TL.Timeline('timeline', new TL.TimelineConfig(json), {
debug:true
});


Expand Down
10 changes: 5 additions & 5 deletions compiled/js/timeline-min.js

Large diffs are not rendered by default.

6 changes: 4 additions & 2 deletions compiled/js/timeline.js
Original file line number Diff line number Diff line change
Expand Up @@ -8141,10 +8141,12 @@ TL.Media.Text = TL.Class.extend({
if (this.data.text != "") {
var text_content = "";

text_content += TL.Util.htmlify(this.options.autolink == true ? TL.Util.linkify(this.data.text) : this.data.text);

text_content += TL.Util.htmlify(this.options.autolink == true ? TL.Util.linkify(this.data.text) : this.data.text);
trace(this.data.text);
this._el.content = TL.Dom.create("div", "tl-text-content", this._el.content_container);
this._el.content.innerHTML = text_content;
trace(text_content);
trace(this._el.content)
}

// Fire event that the slide is loaded
Expand Down
1 change: 1 addition & 0 deletions source/jade/google_spreadsheet_tester.jade
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ html(lang="en")
document.getElementById('timeline').style.height = (window.innerHeight - 40 + "px");

timeline = new TL.Timeline('timeline', new TL.TimelineConfig(json), {
debug:true
});


Expand Down
6 changes: 4 additions & 2 deletions source/js/media/types/TL.Media.Text.js
Original file line number Diff line number Diff line change
Expand Up @@ -108,10 +108,12 @@ TL.Media.Text = TL.Class.extend({
if (this.data.text != "") {
var text_content = "";

text_content += TL.Util.htmlify(this.options.autolink == true ? TL.Util.linkify(this.data.text) : this.data.text);

text_content += TL.Util.htmlify(this.options.autolink == true ? TL.Util.linkify(this.data.text) : this.data.text);
trace(this.data.text);
this._el.content = TL.Dom.create("div", "tl-text-content", this._el.content_container);
this._el.content.innerHTML = text_content;
trace(text_content);
trace(this._el.content)
}

// Fire event that the slide is loaded
Expand Down

0 comments on commit d25de69

Please sign in to comment.