text progress corrected

NEWS.md

@@ -1,6 +1,7 @@
 # sigmajs 0.1.2
 
 * Add multiple buttons with `sg_button`.
+* `sg_progress` * `sg_button` make use of `htmlwidgets` function to prepend or append elements rather than the previous hacky way; improved performances.
 * Improved documentation.
 
 # sigmajs 0.1.1

R/text.R

@@ -6,9 +6,10 @@
 #' @param data Data.frame holding \code{delay} and \code{text}.
 #' @param delay Delay, in milliseconds at which text should appear.
 #' @param text Text to appear on graph.
-#' @param position Text position on graph.
-#' @param element DOM to contain the \code{text}.
-#' @param class CSS class of \code{element} added.
+#' @param tag A Valid \link[htmltools]{tags} function.
+#' @param id A valid CSS id.
+#' @param position Position of button, \code{top} or \code{bottom}.
+#' @param ... Content of the button, complient with \code{htmltools}.
 #' @param cumsum Whether to compute the cumulative sum on the \code{delay}.
 #' 
 #' @details The \code{element} is passed to \href{https://developer.mozilla.org/en-US/docs/Web/API/Document/createElement}{Document.createElement()}
@@ -33,8 +34,8 @@
 #'   sg_button(c("add_nodes", "progress"), "add") 
 #' 
 #' @export
-sg_progress <- function(sg, data, delay, text, position = "right", 
-                        element = "p", class = NULL, cumsum = TRUE){
+sg_progress <- function(sg, data, delay, text, ..., position = "top", id = NULL,
+                        tag = htmltools::span, cumsum = TRUE){
 
   if(missing(data) || missing(delay) || missing(text))
     stop("missing data, delay or text")
@@ -46,14 +47,17 @@ sg_progress <- function(sg, data, delay, text, position = "right",
   text <- eval(substitute(text), data) # subset ids
   data <- data.frame(delay = delay_col, text = text)
 
-  if(is.null(class)) class <-  ""
+  if(is.null(id))
+    id <- .make_rand_id()
 
   sg$x$progressBar <- list(
-    class = class,
+    id = id,
     position = position,
-    element = element,
     data = apply(data, 1, as.list)
   )
 
-  sg
+  if(position == "top")
+    htmlwidgets::prependContent(sg, tag(id = id, ...))
+  else
+    htmlwidgets::appendContent(sg, tag(id = id, ...))
 }

R/zzz.R

@@ -5,6 +5,11 @@ storage_env <- new.env(hash = TRUE)
 		jsonlite::fromJSON(jsonlite::toJSON(data, auto_unbox = TRUE))
 	}, force = TRUE)
   options(SIGMAJS_STORAGE = FALSE)
+
+  packageStartupMessage(
+    "Welcome to sigmajs\n\n",
+    "Docs: sigmajs.john-coene.com"
+  )
 }
 
 .onLoad <- function(libname, pkgname) {

docs/articles/animate_files/sigmajs-binding-0.1.2.9000/sigmajs.js

@@ -181,14 +181,8 @@ HTMLWidgets.widget({
 
 				// progress
 				if(x.hasOwnProperty('progressBar')){
-				  var bar = document.createElement(x.progressBar.element);
-				  bar.style.textAlign  = x.progressBar.position;
-				  bar.className = x.progressBar.class;
 
-				  // widget
-				  var element = document.getElementById(el.id);
-
-				  element.appendChild(bar);
+				  var bar = document.getElementById(x.progressBar.id);
 
 				  if(x.buttonevent.indexOf('progress') > -1){
 
@@ -204,6 +198,12 @@ HTMLWidgets.widget({
 				      }
 				    }
 
+				  } else {
+    				x.progressBar.data.forEach((element) => {
+    					setTimeout(function () {
+    						bar.innerHTML = element.text;
+    					}, element.delay);
+    				});
 				  }
 				}
 

docs/articles/buttons_files/sigmajs-binding-0.1.2.9000/sigmajs.js

@@ -181,14 +181,8 @@ HTMLWidgets.widget({
 
 				// progress
 				if(x.hasOwnProperty('progressBar')){
-				  var bar = document.createElement(x.progressBar.element);
-				  bar.style.textAlign  = x.progressBar.position;
-				  bar.className = x.progressBar.class;
 
-				  // widget
-				  var element = document.getElementById(el.id);
-
-				  element.appendChild(bar);
+				  var bar = document.getElementById(x.progressBar.id);
 
 				  if(x.buttonevent.indexOf('progress') > -1){
 
@@ -204,6 +198,12 @@ HTMLWidgets.widget({
 				      }
 				    }
 
+				  } else {
+    				x.progressBar.data.forEach((element) => {
+    					setTimeout(function () {
+    						bar.innerHTML = element.text;
+    					}, element.delay);
+    				});
 				  }
 				}
 

docs/articles/cluster_files/sigmajs-binding-0.1.2.9000/sigmajs.js

@@ -181,14 +181,8 @@ HTMLWidgets.widget({
 
 				// progress
 				if(x.hasOwnProperty('progressBar')){
-				  var bar = document.createElement(x.progressBar.element);
-				  bar.style.textAlign  = x.progressBar.position;
-				  bar.className = x.progressBar.class;
 
-				  // widget
-				  var element = document.getElementById(el.id);
-
-				  element.appendChild(bar);
+				  var bar = document.getElementById(x.progressBar.id);
 
 				  if(x.buttonevent.indexOf('progress') > -1){
 
@@ -204,6 +198,12 @@ HTMLWidgets.widget({
 				      }
 				    }
 
+				  } else {
+    				x.progressBar.data.forEach((element) => {
+    					setTimeout(function () {
+    						bar.innerHTML = element.text;
+    					}, element.delay);
+    				});
 				  }
 				}
 

docs/articles/dynamic_files/sigmajs-binding-0.1.2.9000/sigmajs.js

@@ -181,14 +181,8 @@ HTMLWidgets.widget({
 
 				// progress
 				if(x.hasOwnProperty('progressBar')){
-				  var bar = document.createElement(x.progressBar.element);
-				  bar.style.textAlign  = x.progressBar.position;
-				  bar.className = x.progressBar.class;
 
-				  // widget
-				  var element = document.getElementById(el.id);
-
-				  element.appendChild(bar);
+				  var bar = document.getElementById(x.progressBar.id);
 
 				  if(x.buttonevent.indexOf('progress') > -1){
 
@@ -204,6 +198,12 @@ HTMLWidgets.widget({
 				      }
 				    }
 
+				  } else {
+    				x.progressBar.data.forEach((element) => {
+    					setTimeout(function () {
+    						bar.innerHTML = element.text;
+    					}, element.delay);
+    				});
 				  }
 				}
 

docs/articles/formats_files/sigmajs-binding-0.1.2.9000/sigmajs.js

@@ -181,14 +181,8 @@ HTMLWidgets.widget({
 
 				// progress
 				if(x.hasOwnProperty('progressBar')){
-				  var bar = document.createElement(x.progressBar.element);
-				  bar.style.textAlign  = x.progressBar.position;
-				  bar.className = x.progressBar.class;
 
-				  // widget
-				  var element = document.getElementById(el.id);
-
-				  element.appendChild(bar);
+				  var bar = document.getElementById(x.progressBar.id);
 
 				  if(x.buttonevent.indexOf('progress') > -1){
 
@@ -204,6 +198,12 @@ HTMLWidgets.widget({
 				      }
 				    }
 
+				  } else {
+    				x.progressBar.data.forEach((element) => {
+    					setTimeout(function () {
+    						bar.innerHTML = element.text;
+    					}, element.delay);
+    				});
 				  }
 				}
 

docs/articles/get_started_files/sigmajs-binding-0.1.2.9000/sigmajs.js

@@ -181,14 +181,8 @@ HTMLWidgets.widget({
 
 				// progress
 				if(x.hasOwnProperty('progressBar')){
-				  var bar = document.createElement(x.progressBar.element);
-				  bar.style.textAlign  = x.progressBar.position;
-				  bar.className = x.progressBar.class;
 
-				  // widget
-				  var element = document.getElementById(el.id);
-
-				  element.appendChild(bar);
+				  var bar = document.getElementById(x.progressBar.id);
 
 				  if(x.buttonevent.indexOf('progress') > -1){
 
@@ -204,6 +198,12 @@ HTMLWidgets.widget({
 				      }
 				    }
 
+				  } else {
+    				x.progressBar.data.forEach((element) => {
+    					setTimeout(function () {
+    						bar.innerHTML = element.text;
+    					}, element.delay);
+    				});
 				  }
 				}