Browse Source

fixing travis errors

tags/v0.3.0
Bob Rudis 8 years ago
parent
commit
c2955cdcc6
  1. 4
      R/shiny-tree-view.R
  2. 2
      R/shiny.R
  3. 2
      R/xmltreeview.R
  4. 10
      R/xmlview.R
  5. 2
      inst/htmlwidgets/xmlview.js
  6. 6
      man/xml_view.Rd

4
R/shiny-tree-view.R

@ -17,7 +17,7 @@
#' @export #' @export
xmltreeviewOutput <- function(outputId, width = '100%', height = '400px'){ xmltreeviewOutput <- function(outputId, width = '100%', height = '400px'){
htmlwidgets::shinyWidgetOutput(outputId, 'xmltreeview', width, height, htmlwidgets::shinyWidgetOutput(outputId, 'xmltreeview', width, height,
package = 'xmlview') package = 'htmltidy')
} }
#' @rdname xmltreeview-shiny #' @rdname xmltreeview-shiny
@ -25,4 +25,4 @@ xmltreeviewOutput <- function(outputId, width = '100%', height = '400px'){
renderXmltreeview <- function(expr, env = parent.frame(), quoted = FALSE) { renderXmltreeview <- function(expr, env = parent.frame(), quoted = FALSE) {
if (!quoted) { expr <- substitute(expr) } # force quoted if (!quoted) { expr <- substitute(expr) } # force quoted
htmlwidgets::shinyRenderWidget(expr, xmltreeviewOutput, env, quoted = TRUE) htmlwidgets::shinyRenderWidget(expr, xmltreeviewOutput, env, quoted = TRUE)
} }

2
R/shiny.R

@ -6,7 +6,7 @@
#' @export #' @export
xmlviewOutput <- function(outputId, width = '100%', height = '400px'){ xmlviewOutput <- function(outputId, width = '100%', height = '400px'){
htmlwidgets::shinyWidgetOutput(outputId, 'xmlview', width, height, htmlwidgets::shinyWidgetOutput(outputId, 'xmlview', width, height,
package = 'xmlview') package = 'htmltidy')
} }
#' Widget render function for use in Shiny #' Widget render function for use in Shiny

2
R/xmltreeview.R

@ -45,7 +45,7 @@ xml_tree_view <- function(doc=NULL, scroll=FALSE,
x = params, x = params,
width = width, width = width,
height = height, height = height,
package = 'xmlview', package = 'htmltidy',
elementId = elementId elementId = elementId
) )

10
R/xmlview.R

@ -43,10 +43,10 @@
#' xml_view(xml_find_all(doc, ".//to"), style="github-gist") #' xml_view(xml_find_all(doc, ".//to"), style="github-gist")
#' #'
#' # some more complex daata #' # some more complex daata
#' xml_view(read_xml(system.file("extdata/dwml.xml", package="xmlview"))) #' xml_view(read_xml(system.file("extdata/dwml.xml", package="htmltidy")))
#' xml_view(read_xml(system.file("extdata/getHistory.xml", package="xmlview")), #' xml_view(read_xml(system.file("extdata/getHistory.xml", package="htmltidy")),
#' "androidstudio") #' "androidstudio")
#' xml_view(read_xml(system.file("extdata/input.xml", package="xmlview")), #' xml_view(read_xml(system.file("extdata/input.xml", package="htmltidy")),
#' "sunburst") #' "sunburst")
#' #'
#' # filter + apply an initial XPath query string #' # filter + apply an initial XPath query string
@ -92,7 +92,7 @@ xml_view <- function(doc, style="default", scroll=FALSE, add_filter=FALSE,
params, params,
width = width, width = width,
height = height, height = height,
package = 'xmlview', package = 'htmltidy',
elementId = elementId elementId = elementId
) )
@ -115,6 +115,6 @@ html_view <- xml_view
highlight_styles <- function() { highlight_styles <- function() {
gsub("\\.css$", "", gsub("\\.css$", "",
grep("\\.css$", grep("\\.css$",
list.files(system.file("htmlwidgets/lib/highlightjs/styles", package="xmlview")), list.files(system.file("htmlwidgets/lib/highlightjs/styles", package="htmltidy")),
value=TRUE)) value=TRUE))
} }

2
inst/htmlwidgets/xmlview.js

@ -163,4 +163,4 @@ HTMLWidgets.widget({
resize: function(el, width, height, instance) {}, resize: function(el, width, height, instance) {},
}); });

6
man/xml_view.Rd

@ -63,10 +63,10 @@ xml_view(doc, style="obsidian")
xml_view(xml_find_all(doc, ".//to"), style="github-gist") xml_view(xml_find_all(doc, ".//to"), style="github-gist")
# some more complex daata # some more complex daata
xml_view(read_xml(system.file("extdata/dwml.xml", package="xmlview"))) xml_view(read_xml(system.file("extdata/dwml.xml", package="htmltidy")))
xml_view(read_xml(system.file("extdata/getHistory.xml", package="xmlview")), xml_view(read_xml(system.file("extdata/getHistory.xml", package="htmltidy")),
"androidstudio") "androidstudio")
xml_view(read_xml(system.file("extdata/input.xml", package="xmlview")), xml_view(read_xml(system.file("extdata/input.xml", package="htmltidy")),
"sunburst") "sunburst")
# filter + apply an initial XPath query string # filter + apply an initial XPath query string

Loading…
Cancel
Save