Skip to content

Commit 9b16992

Browse files
mkurzmkurz
committed
Remove deprecated Symbol literal for *.scala.html files via regex
find core-play27/ play27-bootstrap3/ play27-bootstrap4/ -name *.scala.html | xargs sed -i "s/'\([^) ]\+\))/Symbol(\"\1\"))/g"
1 parent 56e3207 commit 9b16992

18 files changed

Lines changed: 36 additions & 36 deletions

‎play27-bootstrap3/module/app/views/b3/checkbox.scala.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
val argsMap = args.toMap
44
val value = argsMap.get(Symbol("value")).getOrElse("true").toString
55
val checked = argsMap.get(Symbol("checked")).orElse(field.value.map(_ == value).orElse(argsMap.get(Symbol("_default")))).map(_.toString == "true").getOrElse(false)
6-
val containsReadonly = argsMap.contains('readonly)
7-
val readonly = bs.ArgsMap.isTrue(argsMap, 'readonly)
8-
val disabled = readonly || bs.ArgsMap.isTrue(argsMap, 'disabled)
6+
val containsReadonly = argsMap.contains(Symbol("readonly"))
7+
val readonly = bs.ArgsMap.isTrue(argsMap, Symbol("readonly"))
8+
val disabled = readonly || bs.ArgsMap.isTrue(argsMap, Symbol("disabled"))
99
(argsMap, value, checked, containsReadonly, readonly, disabled)
1010
}){ case (argsMap, value, checked, containsReadonly, readonly, disabled) =>
11-
@inputFormGroup(field, withFeedback = false, withLabelFor = false, bs.Args.withDefault(args.filterNot(_._1 == 'checked), Symbol("checked") -> checked, Symbol("disabled") -> disabled)) { fieldInfo =>
11+
@inputFormGroup(field, withFeedback = false, withLabelFor = false, bs.Args.withDefault(args.filterNot(_._1 == Symbol("checked")), Symbol("checked") -> checked, Symbol("disabled") -> disabled)) { fieldInfo =>
1212
<div class="checkbox@if(containsReadonly){ checkbox-group}@if(disabled){ disabled}">
1313
<label for="@fieldInfo.id">
1414
<input type="checkbox" id="@fieldInfo.id" name="@fieldInfo.name" value="@value" @toHtmlArgs(fieldInfo.innerArgsMap)>

‎play27-bootstrap3/module/app/views/b3/form.scala.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
@(action: Call, args: (Symbol, Any)*)(body: => Html)(implicit fc: b3.B3FieldConstructor)
2-
<form action="@action.toString" method="@action.method" class="@fc.formClass @bs.Args.get(args, 'class)" @toHtmlArgs(bs.Args.remove(bs.Args.inner(args, Symbol("role") -> "form"), 'class).toMap)>
2+
<form action="@action.toString" method="@action.method" class="@fc.formClass @bs.Args.get(args, Symbol("class"))" @toHtmlArgs(bs.Args.remove(bs.Args.inner(args, Symbol("role") -> "form"), Symbol("class")).toMap)>
33
@body
44
</form>

‎play27-bootstrap3/module/app/views/b3/horizontal/bsFormGroup.scala.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@(contentHtml: Html, argsMap: Map[Symbol, Any], colLabel: String, colOffset: String, colInput: String)(implicit messages: MessagesProvider)
22
@b3.bsFormGroupCommon(contentHtml, argsMap) { content =>
33
@argsMap.get(Symbol("_label")).map { label =>
4-
<label class="control-label @colLabel@if(bs.ArgsMap.isTrue(argsMap, '_hideLabel)){ sr-only}">@bs.Args.msg(label)(messages)</label>
4+
<label class="control-label @colLabel@if(bs.ArgsMap.isTrue(argsMap, Symbol("_hideLabel"))){ sr-only}">@bs.Args.msg(label)(messages)</label>
55
<div class="@colInput">
66
@content
77
</div>

‎play27-bootstrap3/module/app/views/b3/inline/bsFormGroup.scala.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@(contentHtml: Html, argsMap: Map[Symbol, Any])(implicit messages: MessagesProvider)
22
@b3.bsFormGroupCommon(contentHtml, argsMap) { content =>
33
@argsMap.get(Symbol("_label")).map { label =>
4-
<label class="control-label@if(bs.ArgsMap.isTrue(argsMap, '_hideLabel)){ sr-only}">@bs.Args.msg(label)(messages)</label>
4+
<label class="control-label@if(bs.ArgsMap.isTrue(argsMap, Symbol("_hideLabel"))){ sr-only}">@bs.Args.msg(label)(messages)</label>
55
}
66
@content
77
}

‎play27-bootstrap3/module/app/views/b3/radioWithContent.scala.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@(field: Field, args: (Symbol, Any)*)(content: Tuple3[Boolean, Boolean, b3.B3FieldInfo] => Html)(implicit fc: b3.B3FieldConstructor, messages: MessagesProvider)
22
@readonlyWrapper(name: String, value: Option[String], argsMap: Map[Symbol, Any], disabled: Boolean)(contentWrapped: Html) = {
3-
@if(argsMap.contains('readonly)) {
3+
@if(argsMap.contains(Symbol("readonly"))) {
44
<div class="radio-group">
55
@contentWrapped
66
<input type="hidden" name="@name" value="@{value.orElse(argsMap.get(Symbol("_hiddenValue"))).get}"@if(!disabled){ disabled}/>
@@ -9,9 +9,9 @@
99
}
1010
@defining({
1111
val argsMap = args.toMap
12-
val inline = bs.ArgsMap.isTrue(argsMap, '_inline) || fc.formClass == "form-inline"
13-
val readonly = bs.ArgsMap.isTrue(argsMap, 'readonly)
14-
val disabled = readonly || bs.ArgsMap.isTrue(argsMap, 'disabled)
12+
val inline = bs.ArgsMap.isTrue(argsMap, Symbol("_inline")) || fc.formClass == "form-inline"
13+
val readonly = bs.ArgsMap.isTrue(argsMap, Symbol("readonly"))
14+
val disabled = readonly || bs.ArgsMap.isTrue(argsMap, Symbol("disabled"))
1515
(argsMap, inline, disabled)
1616
}) { case (argsMap, inline, disabled) =>
1717
@inputFormGroup(field, withFeedback = false, withLabelFor = false, bs.Args.withDefault(args, Symbol("disabled") -> disabled)) { fieldInfo =>

‎play27-bootstrap3/module/app/views/b3/selectWithContent.scala.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@(field: Field, args: (Symbol,Any)*)(content: Set[String] => Html)(implicit fc: b3.B3FieldConstructor, messages: MessagesProvider)
22
@readonlyWrapper(selectName: String, value: Option[String], disabled: Boolean, argsMap: Map[Symbol, Any])(contentWrapped: Html) = {
3-
@if(argsMap.contains('readonly)) {
3+
@if(argsMap.contains(Symbol("readonly"))) {
44
<div class="select-group">
55
@contentWrapped
66
<input type="hidden" name="@selectName" value="@{value.orElse(argsMap.get(Symbol("_hiddenValue"))).get}"@if(!disabled){ disabled}/>
@@ -9,9 +9,9 @@
99
}
1010
@defining({
1111
val argsMap = args.toMap
12-
val readonly = bs.ArgsMap.isTrue(argsMap, 'readonly)
13-
val disabled = readonly || bs.ArgsMap.isTrue(argsMap, 'disabled)
14-
val multiple = bs.ArgsMap.isTrue(argsMap, 'multiple)
12+
val readonly = bs.ArgsMap.isTrue(argsMap, Symbol("readonly"))
13+
val disabled = readonly || bs.ArgsMap.isTrue(argsMap, Symbol("disabled"))
14+
val multiple = bs.ArgsMap.isTrue(argsMap, Symbol("multiple"))
1515
(argsMap, disabled, multiple)
1616
}) { case (argsMap, disabled, multiple) =>
1717
@inputFormGroup(field, withFeedback = false, withLabelFor = true, bs.Args.withDefault(bs.Args.withAddingStringValue(args, 'class, "form-control"), Symbol("disabled") -> disabled)) { fieldInfo =>

‎play27-bootstrap3/module/app/views/b3/selectWithOptions.scala.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@(field: Field, options: Seq[(String,String)], args: (Symbol,Any)*)(implicit fc: b3.B3FieldConstructor, messages: MessagesProvider)
2-
@selectWithContent(field, bs.Args.withDefault(args, Symbol("_hiddenValue") -> bs.Args.get(args, '_default).orElse(options.headOption.map(_._1))):_*) { implicit values =>
2+
@selectWithContent(field, bs.Args.withDefault(args, Symbol("_hiddenValue") -> bs.Args.get(args, Symbol("_default")).orElse(options.headOption.map(_._1))):_*) { implicit values =>
33
@options.map { v =>
44
@selectOption(v._1, v._2)
55
}

‎play27-bootstrap3/module/app/views/b3/vertical/bsFormGroup.scala.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@(contentHtml: Html, argsMap: Map[Symbol, Any])(implicit messages: MessagesProvider)
22
@b3.bsFormGroupCommon(contentHtml, argsMap) { content =>
33
@argsMap.get(Symbol("_label")).map { label =>
4-
<label class="control-label@if(bs.ArgsMap.isTrue(argsMap, '_hideLabel)){ sr-only}">@bs.Args.msg(label)(messages)</label>
4+
<label class="control-label@if(bs.ArgsMap.isTrue(argsMap, Symbol("_hideLabel"))){ sr-only}">@bs.Args.msg(label)(messages)</label>
55
}
66
@content
77
}

‎play27-bootstrap3/sample/app/views/b3/my/vertical/bsFieldConstructor.scala.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
@alertStatus = @{
33
if (fieldInfo.hasErrors)
44
"alert-danger"
5-
else if (bs.ArgsMap.isTrue(fieldInfo.argsMap, '_success))
5+
else if (bs.ArgsMap.isTrue(fieldInfo.argsMap, Symbol("_success")))
66
"alert-success"
77
else
88
"alert-info"

‎play27-bootstrap4/module/app/views/b4/checkbox.scala.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
val textOpt = argsMap.get(Symbol("_text")).map(bs.Args.msg(_)(msgsProv))
1313
val value = argsMap.get(Symbol("value")).getOrElse("true").toString
1414
val checked = argsMap.get(Symbol("checked")).orElse(field.value.map(_ == value).orElse(argsMap.get(Symbol("_default")))).map(_.toString == "true").getOrElse(false)
15-
val containsReadonly = argsMap.contains('readonly)
16-
val readonly = bs.ArgsMap.isTrue(argsMap, 'readonly)
17-
val disabled = readonly || bs.ArgsMap.isTrue(argsMap, 'disabled)
15+
val containsReadonly = argsMap.contains(Symbol("readonly"))
16+
val readonly = bs.ArgsMap.isTrue(argsMap, Symbol("readonly"))
17+
val disabled = readonly || bs.ArgsMap.isTrue(argsMap, Symbol("disabled"))
1818
(argsMap, textOpt, value, checked, containsReadonly, readonly, disabled)
1919
}){ case (argsMap, textOpt, value, checked, containsReadonly, readonly, disabled) =>
20-
@inputFormGroup(field, withLabelFor = false, bs.Args.withDefault(args.filterNot(_._1 == 'checked), Symbol("checked") -> checked, Symbol("disabled") -> disabled)) { fieldInfo =>
20+
@inputFormGroup(field, withLabelFor = false, bs.Args.withDefault(args.filterNot(_._1 == Symbol("checked")), Symbol("checked") -> checked, Symbol("disabled") -> disabled)) { fieldInfo =>
2121
@defining(fieldInfo.isCustom) { isCustom =>
2222
<div class="@if(isCustom){custom-control custom-checkbox}else{form-check}@if(containsReadonly){ checkbox-group}">
2323
@if(isCustom) {

0 commit comments

Comments
 (0)