Skip to content

Commit

Permalink
Fix check error renew website
Browse files Browse the repository at this point in the history
  • Loading branch information
fmannhardt committed Nov 19, 2018
1 parent 6fbc9cb commit 7bc450d
Show file tree
Hide file tree
Showing 11 changed files with 103 additions and 119 deletions.
2 changes: 2 additions & 0 deletions .Rbuildignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
^Meta$
^doc$
^.*\.Rproj$
^\.Rproj\.user$
^.Rhistory$
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
Meta
doc
# History files
.Rhistory
.Rapp.history
Expand Down
8 changes: 4 additions & 4 deletions docs/articles/use-external-data-to-change-tokens.html

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -10,33 +10,11 @@ HTMLWidgets.widget({

factory: function(el, width, height) {

var slider = new Slider(el);
var control = new PlaybackControl(el);
var scales = new Scales(el);
var tokens = null;
var renderer = null;

var repeatLoop = null;
var repeatCount = 1;

function repeatAnimation(data, svg) {
if (data.repeat_count === null) {
data.repeat_count = Infinity;
}
if (repeatLoop) {
window.cancelAnimationFrame(repeatLoop);
}
(function(){
var time = svg.getCurrentTime();
if (time > (data.duration + data.repeat_delay) && repeatCount < data.repeat_count) {
svg.setCurrentTime(0);
repeatCount++;
}
if (repeatCount < data.repeat_count) {
repeatLoop = window.requestAnimationFrame(arguments.callee);
}
})();
}

return {

renderValue: function(data) {
Expand All @@ -63,24 +41,26 @@ HTMLWidgets.widget({
var tokenGroup = tokens.insertTokens(svg);
tokens.attachEventListeners(svg, tokenGroup);

slider.renderSlider(data, svg, width);
control.renderPlaybackControl(data, svg, width);
scales.renderLegend(data, svg, width, height);

repeatAnimation(data, svg);

renderer.resize(width, Math.max(0, height - slider.getHeight()));
renderer.resize(width, Math.max(0, height - control.getHeight()));
});

},

resize: function(width, height) {

if (renderer) {
slider.renderSlider(renderer.getData(), renderer.getSvg(), width);
control.renderPlaybackControl(renderer.getData(), renderer.getSvg(), width);
scales.resizeLegend(renderer.getSvg(), width, height);
renderer.resize(width, Math.max(0, height - slider.getHeight()));
renderer.resize(width, Math.max(0, height - control.getHeight()));
}

},

getPlaybackControl: function() {
return control;
}

};
Expand Down
98 changes: 54 additions & 44 deletions docs/articles/use-shiny-selections.html

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

16 changes: 8 additions & 8 deletions docs/articles/use-token_scales.html

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -10,33 +10,11 @@ HTMLWidgets.widget({

factory: function(el, width, height) {

var slider = new Slider(el);
var control = new PlaybackControl(el);
var scales = new Scales(el);
var tokens = null;
var renderer = null;

var repeatLoop = null;
var repeatCount = 1;

function repeatAnimation(data, svg) {
if (data.repeat_count === null) {
data.repeat_count = Infinity;
}
if (repeatLoop) {
window.cancelAnimationFrame(repeatLoop);
}
(function(){
var time = svg.getCurrentTime();
if (time > (data.duration + data.repeat_delay) && repeatCount < data.repeat_count) {
svg.setCurrentTime(0);
repeatCount++;
}
if (repeatCount < data.repeat_count) {
repeatLoop = window.requestAnimationFrame(arguments.callee);
}
})();
}

return {

renderValue: function(data) {
Expand All @@ -63,24 +41,26 @@ HTMLWidgets.widget({
var tokenGroup = tokens.insertTokens(svg);
tokens.attachEventListeners(svg, tokenGroup);

slider.renderSlider(data, svg, width);
control.renderPlaybackControl(data, svg, width);
scales.renderLegend(data, svg, width, height);

repeatAnimation(data, svg);

renderer.resize(width, Math.max(0, height - slider.getHeight()));
renderer.resize(width, Math.max(0, height - control.getHeight()));
});

},

resize: function(width, height) {

if (renderer) {
slider.renderSlider(renderer.getData(), renderer.getSvg(), width);
control.renderPlaybackControl(renderer.getData(), renderer.getSvg(), width);
scales.resizeLegend(renderer.getSvg(), width, height);
renderer.resize(width, Math.max(0, height - slider.getHeight()));
renderer.resize(width, Math.max(0, height - control.getHeight()));
}

},

getPlaybackControl: function() {
return control;
}

};
Expand Down
2 changes: 1 addition & 1 deletion docs/articles/use-with-shiny.html

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

2 changes: 1 addition & 1 deletion docs/pkgdown.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pandoc: 2.2.1
pandoc: 2.3.1
pkgdown: 1.1.0
pkgdown_sha: ~
articles:
Expand Down
Loading

0 comments on commit 7bc450d

Please sign in to comment.