Mercurial Mercurial > ngtags / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
scalatags -> 0.6.0, uib tags (deprecation of old twbs tags)
authorTomas Zeman <tzeman@volny.cz>
Wed, 28 Sep 2016 21:06:06 +0200
changeset 33 f374e9058364
parent 32 cf1995e5a48d
child 34 9e894f5bb93c
scalatags -> 0.6.0, uib tags (deprecation of old twbs tags)
build.sbt file | annotate | diff | comparison | revisions
js/src/main/scala/Nvd3Chart.scala file | annotate | diff | comparison | revisions
shared/src/main/scala/Nvd3.scala file | annotate | diff | comparison | revisions
shared/src/main/scala/Tags.scala file | annotate | diff | comparison | revisions
shared/src/main/scala/ngTags.scala file | annotate | diff | comparison | revisions
shared/src/main/scala/twbsTags.scala file | annotate | diff | comparison | revisions 
--- a/build.sbt	Thu Mar 31 15:57:05 2016 +0200
+++ b/build.sbt	Wed Sep 28 21:06:06 2016 +0200
@@ -19,7 +19,7 @@
 settings(buildSettings:_*).
 settings(
   libraryDependencies ++= Seq(
-    "com.lihaoyi" %%% "scalatags" % "0.5.3"
+    "com.lihaoyi" %%% "scalatags" % "0.6.0"
     //"com.github.japgolly.scalacss" %%% "ext-scalatags" % "0.1.0"
   ),
 
--- a/js/src/main/scala/Nvd3Chart.scala	Thu Mar 31 15:57:05 2016 +0200
+++ b/js/src/main/scala/Nvd3Chart.scala	Wed Sep 28 21:06:06 2016 +0200
@@ -84,6 +84,7 @@
 object Chart {
   private def as(t: Symbol) = new Chart(Map("type" -> t.name))
 
+  def lineChart = as('lineChart)
   def bulletChart = as('bulletChart)
   def cumulativeLineChart = as('cumulativeLineChart)
   def discreteBarChart = as('discreteBarChart)
@@ -93,7 +94,7 @@
   def multiBarHorizontalChart = as('multiBarHorizontalChart)
   def stackedAreaChart = as('stackedAreaChart)
 
-  def axis(l: String) = new Axis(Map()) axisLabel(l)
+  def axis(l: String) = new Axis(Map()) axisLabel l
   def margin = new Margin(Map())
   def legend = new Legend(Map())
 }
--- a/shared/src/main/scala/Nvd3.scala	Thu Mar 31 15:57:05 2016 +0200
+++ b/shared/src/main/scala/Nvd3.scala	Wed Sep 28 21:06:06 2016 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Tomas Zeman <tzeman@volny.cz>
+ * Copyright 2015-2016 Tomas Zeman <tzeman@volny.cz>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,9 +18,9 @@
 import scalatags.Text.all._
 
 object Nvd3 {
-  val nvd3 = "nvd3".tag
-  def nvd3options(varName: String) = "options".attr:=varName
-  def nvd3data(varName: String) = "data".attr:=varName
+  val nvd3 = tag("nvd3")
+  def nvd3options(varName: String) = attr("options"):=varName
+  def nvd3data(varName: String) = attr("data"):=varName
 }
 
 // vim: set ts=2 sw=2 et:
--- a/shared/src/main/scala/Tags.scala	Thu Mar 31 15:57:05 2016 +0200
+++ b/shared/src/main/scala/Tags.scala	Wed Sep 28 21:06:06 2016 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Tomas Zeman <tzeman@volny.cz>
+ * Copyright 2015-2016 Tomas Zeman <tzeman@volny.cz>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,16 +18,16 @@
 import scalatags.Text.all._
 
 object Tags {
-  val closeAttr = "close".attr
-  val dataFramework: Attr = "data-framework".attr
-  val dataToggle: Attr = "data-toggle".attr
-  val dataTarget: Attr = "data-target".attr
+  val closeAttr = attr("close")
+  val dataFramework: Attr = attr("data-framework")
+  val dataToggle: Attr = attr("data-toggle")
+  val dataTarget: Attr = attr("data-target")
 
   val html5 = "<!DOCTYPE html>"
   val nbsp = raw("&nbsp;")
-  val scope = "scope".attr
+  val scope = attr("scope")
 
-  val typeAttr = "type".attr
+  val typeAttr = attr("type")
 }
 
 // vim: set ts=2 sw=2 et:
--- a/shared/src/main/scala/ngTags.scala	Thu Mar 31 15:57:05 2016 +0200
+++ b/shared/src/main/scala/ngTags.scala	Wed Sep 28 21:06:06 2016 +0200
@@ -20,43 +20,43 @@
 object ngTags {
   def i18n(s: String): String = s"{{'$s' | translate}}"
   def interpolate(s: String) = s"{{$s}}"
-  def isOpen(expr: String) = "is-open".attr:=expr
+  def isOpen(expr: String) = attr("is-open"):=expr
 
-  val ngAlert = "alert".tag
-  val ngApp: Attr = "ng-app".attr
-  def ngBindHtml(safe: String) = "ng-bind-html".attr:=safe
-  def ngChange(expr: String) = "ng-change".attr:=expr
-  def ngClick(expr: String) = "ng-click".attr:=expr
-  val ngCloak = "ng-cloak".tag
-  def ngCls(expr: String) = "ng-class".attr:=expr
-  def ngCtrl(c: String) = "ng-controller".attr:=c
-  def ngDisabled(expr: String) = "ng-disabled".attr:=expr
-  def ngHide(expr: String) = "ng-hide".attr:=expr
-  def ngHref(expr: String) = "ng-href".attr:=interpolate(expr)
-  def ngIf(expr: String) = "ng-if".attr:=expr
-  val ngInclude = "ng-include".tag
-  def ngInit(expr: String) = "ng-init".attr:=expr
-  def ngModel(expr: String) = "ng-model".attr:=expr
-  def ngReadonly(expr: String) = "ng-readonly".attr:=expr
-  def ngRepeat(name: String, list: String) = "ng-repeat".attr:=s"$name in $list"
-  def ngRepeatStart(n: String, l: String) = "ng-repeat-start".attr:=s"$n in $l"
-  def ngSrc(expr: String) = "ng-src".attr:=expr
-  def ngShow(expr: String) = "ng-show".attr:=expr
-  def ngStyle(s: String) = "ng-style".attr:=s
-  def ngValue(expr: String) = "ng-value".attr:=expr
-  val ngView = "ng-view".tag
+  val ngAlert = tag("alert")
+  val ngApp: Attr = attr("ng-app")
+  def ngBindHtml(safe: String) = attr("ng-bind-html"):=safe
+  def ngChange(expr: String) = attr("ng-change"):=expr
+  def ngClick(expr: String) = attr("ng-click"):=expr
+  val ngCloak = tag("ng-cloak")
+  def ngCls(expr: String) = attr("ng-class"):=expr
+  def ngCtrl(c: String) = attr("ng-controller"):=c
+  def ngDisabled(expr: String) = attr("ng-disabled"):=expr
+  def ngHide(expr: String) = attr("ng-hide"):=expr
+  def ngHref(expr: String) = attr("ng-href"):=interpolate(expr)
+  def ngIf(expr: String) = attr("ng-if"):=expr
+  val ngInclude = attr("ng-include")
+  def ngInit(expr: String) = attr("ng-init"):=expr
+  def ngModel(expr: String) = attr("ng-model"):=expr
+  def ngReadonly(expr: String) = attr("ng-readonly"):=expr
+  def ngRepeat(name: String, list: String) = attr("ng-repeat"):=s"$name in $list"
+  def ngRepeatStart(n: String, l: String) = attr("ng-repeat-start"):=s"$n in $l"
+  def ngSrc(expr: String) = attr("ng-src"):=expr
+  def ngShow(expr: String) = attr("ng-show"):=expr
+  def ngStyle(s: String) = attr("ng-style"):=s
+  def ngValue(expr: String) = attr("ng-value"):=expr
+  val ngView = tag("ng-view")
 
-  val translateAttr = "translate".attr
+  val translateAttr = attr("translate")
 }
 
 object uiSelect {
-  val uiSelect = "ui-select".tag
-  val uiSelectMatch = "ui-select-match".tag
-  val uiSelectChoices = "ui-select-choices".tag
-  def theme(t: String) = "theme".attr:=t
-  def repeat(n: String, col: String) = "repeat".attr:=s"$n in $col"
-  def onSelect(fun: String) = "on-select".attr:=fun
-  def onRemove(fun: String) = "on-remove".attr:=fun
+  val uiSelect = tag("ui-select")
+  val uiSelectMatch = tag("ui-select-match")
+  val uiSelectChoices = tag("ui-select-choices")
+  def theme(t: String) = attr("theme"):=t
+  def repeat(n: String, col: String) = attr("repeat"):=s"$n in $col"
+  def onSelect(fun: String) = attr("on-select"):=fun
+  def onRemove(fun: String) = attr("on-remove"):=fun
 }
 
 // vim: set ts=2 sw=2 et:
--- a/shared/src/main/scala/twbsTags.scala	Thu Mar 31 15:57:05 2016 +0200
+++ b/shared/src/main/scala/twbsTags.scala	Wed Sep 28 21:06:06 2016 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Tomas Zeman <tzeman@volny.cz>
+ * Copyright 2015-2016 Tomas Zeman <tzeman@volny.cz>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,28 +17,56 @@
 
 import scalatags.Text.all._
 
+@deprecated("Use uibAccordion", "0.5")
 object Accordion {
-  val acMain = "accordion".tag
-  val acGroup = "accordion-group".tag
-  val acHeading = "accordion-heading".tag
-  val closeOthers = "close-others".attr
+  val acMain = tag("accordion")
+  val acGroup = tag("accordion-group")
+  val acHeading = tag("accordion-heading")
+  val closeOthers = attr("close-others")
+}
+
+object uibAccordion {
+  val acMain = tag("uib-accordion")
+  val acGroup = tag("uib-accordion-group")
+  val acHeading = tag("uib-accordion-heading")
+  val closeOthers = attr("close-others")
 }
 
+@deprecated("Use uibTags", "0.5")
 object twbsTags {
-  val dropdown = "dropdown".attr
-  val dropdownToggle = "dropdown-toggle".attr
-  val nav = "nav".tag
-  def tooltip(content: String) = "tooltip".attr:=content
-  def tooltipAppendToBody(b: Boolean) = "tooltip-append-to-body".attr:=b
-  def tooltipPlacement(where: String) = "tooltip-placement".attr:=where
-  def tooltipTrigger(events: String) = "tooltip-trigger".attr:=events
+  val dropdown = attr("dropdown")
+  val dropdownToggle = attr("dropdown-toggle")
+  val nav = tag("nav")
+  def tooltip(content: String) = attr("tooltip"):=content
+  def tooltipAppendToBody(b: Boolean) = attr("tooltip-append-to-body"):=b
+  def tooltipPlacement(where: String) = attr("tooltip-placement"):=where
+  def tooltipTrigger(events: String) = attr("tooltip-trigger"):=events
 }
 
+object uibTags {
+  val dropdown = attr("uib-dropdown")
+  val dropdownToggle = attr("uib-dropdown-toggle")
+  val nav = tag("nav")
+  def tooltip(content: String) = attr("uib-tooltip"):=content
+  def tooltipHtml(content: String) = attr("uib-tooltip-html"):=content
+  def tooltipAppendToBody(b: Boolean) = attr("tooltip-append-to-body"):=b
+  def tooltipPlacement(where: String) = attr("tooltip-placement"):=where
+  def tooltipTrigger(events: String) = attr("tooltip-trigger"):=events
+}
+
+@deprecated("Use uibTabs", "0.5")
 object Tabs {
-  val tabset = "tabset".tag
-  val tab = "tab".tag
-  val tabHeading = "tab-heading".tag
-  val heading = "heading".attr
+  val tabset = tag("tabset")
+  val tab = tag("tab")
+  val tabHeading = tag("tab-heading")
+  val heading = attr("heading")
+}
+
+object uibTabs {
+  val tabset = tag("uib-tabset")
+  val tab = tag("uib-tab")
+  val tabHeading = tag("uib-tab-heading")
+  val heading = attr("heading")
 }
 
 // vim: set ts=2 sw=2 et:
ngtags