Skip to content

Commit 444f1c8

Browse files
adrianhurtadrianhurt
authored
Merge pull request #124 from mkurz/fix-symbol-literals
Remove deprecated Symbol literal
2 parents 46361ee + b99a160 commit 444f1c8

71 files changed

Lines changed: 1283 additions & 1283 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎core-play27/app/views/bs/package.scala‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -33,30 +33,30 @@ package object bs {
3333
val argsMap: Map[Symbol, Any] = Args.withoutNones(args).toMap
3434

3535
/* Id of the input */
36-
val id: String = argsMap.get('id).map(_.toString).getOrElse(field.id)
36+
val id: String = argsMap.get(Symbol("id")).map(_.toString).getOrElse(field.id)
3737

3838
/* Id of the form-group */
39-
val idFormField: String = argsMap.get('_id).map(_.toString).getOrElse(id + "_field")
39+
val idFormField: String = argsMap.get(Symbol("_id")).map(_.toString).getOrElse(id + "_field")
4040

4141
/* The optional label */
42-
val labelOpt: Option[Any] = argsMap.get('_label).orElse(argsMap.get('_hiddenLabel))
42+
val labelOpt: Option[Any] = argsMap.get(Symbol("_label")).orElse(argsMap.get(Symbol("_hiddenLabel")))
4343

4444
/* Indicates if the label must be hidden */
45-
val hideLabel: Boolean = isTrue(argsMap, '_hideLabel) || argsMap.contains('_hiddenLabel)
45+
val hideLabel: Boolean = isTrue(argsMap, Symbol("_hideLabel")) || argsMap.contains(Symbol("_hiddenLabel"))
4646

4747
/* Name of the input */
4848
def name: String = field.name
4949

5050
/* Value of the input */
51-
val value: Option[String] = field.value.orElse(argsMap.get('value).map(_.toString))
51+
val value: Option[String] = field.value.orElse(argsMap.get(Symbol("value")).map(_.toString))
5252

5353
/* List with every error and its corresponding ARIA id. Ex: ("foo_error_0" -> "foo error") */
5454
val errors: Seq[(String, Any)] = BSFieldInfo.errors(Some(field), argsMap, msgsProv).zipWithIndex.map {
5555
case (error, i) => (id + "_error_" + i, error)
5656
}
5757

5858
/* Indicates if there is any error */
59-
val hasErrors: Boolean = !errors.isEmpty || ArgsMap.isNotFalse(argsMap, '_error)
59+
val hasErrors: Boolean = !errors.isEmpty || ArgsMap.isNotFalse(argsMap, Symbol("_error"))
6060

6161
/* The optional validation state ("success", "warning" or "error") */
6262
lazy val status: Option[String] = BSFieldInfo.status(hasErrors, argsMap)
@@ -74,30 +74,30 @@ package object bs {
7474

7575
/* List with every error */
7676
def errors(maybeField: Option[Field], argsMap: Map[Symbol, Any], msgsProv: MessagesProvider): Seq[Any] = {
77-
argsMap.get('_error).filter(!_.isInstanceOf[Boolean]).map {
77+
argsMap.get(Symbol("_error")).filter(!_.isInstanceOf[Boolean]).map {
7878
_ match {
7979
case Some(FormError(_, message, args)) => Seq(msgsProv.messages(message, args.map(a => translate(a)(msgsProv)): _*))
8080
case FormError(_, message, args) => Seq(msgsProv.messages(message, args.map(a => translate(a)(msgsProv)): _*))
8181
case message => Seq(translate(message)(msgsProv))
8282
}
8383
}.getOrElse {
84-
maybeField.filter(_ => argsMap.get('_showErrors) != Some(false)).map { field =>
84+
maybeField.filter(_ => argsMap.get(Symbol("_showErrors")) != Some(false)).map { field =>
8585
field.errors.map { e => msgsProv.messages(e.message, e.args.map(a => translate(a)(msgsProv)): _*) }
8686
}.getOrElse(Nil)
8787
}
8888
}
8989

9090
/* List with every "feedback info" except "errors" */
9191
def feedbackInfosButErrors(argsMap: Map[Symbol, Any], msgsProv: MessagesProvider): Seq[Any] = {
92-
argsMap.get('_warning).filter(!_.isInstanceOf[Boolean]).map(m => Seq(translate(m)(msgsProv))).getOrElse(
93-
argsMap.get('_success).filter(!_.isInstanceOf[Boolean]).map(m => Seq(translate(m)(msgsProv))).getOrElse(Nil)
92+
argsMap.get(Symbol("_warning")).filter(!_.isInstanceOf[Boolean]).map(m => Seq(translate(m)(msgsProv))).getOrElse(
93+
argsMap.get(Symbol("_success")).filter(!_.isInstanceOf[Boolean]).map(m => Seq(translate(m)(msgsProv))).getOrElse(Nil)
9494
)
9595
}
9696

9797
/* List with every "help info", i.e. a help text or constraints */
9898
def helpInfos(maybeField: Option[Field], argsMap: Map[Symbol, Any], msgsProv: MessagesProvider): Seq[Any] = {
99-
argsMap.get('_help).map(m => Seq(translate(m)(msgsProv))).getOrElse {
100-
maybeField.filter(_ => argsMap.get('_showConstraints) == Some(true)).map { field =>
99+
argsMap.get(Symbol("_help")).map(m => Seq(translate(m)(msgsProv))).getOrElse {
100+
maybeField.filter(_ => argsMap.get(Symbol("_showConstraints")) == Some(true)).map { field =>
101101
field.constraints.map(c => msgsProv.messages(c._1, c._2.map(a => translate(a)(msgsProv)): _*)) ++ field.format.map(f => msgsProv.messages(f._1, f._2.map(a => translate(a)(msgsProv)): _*))
102102
}.getOrElse(Nil)
103103
}
@@ -107,24 +107,24 @@ package object bs {
107107
def status(hasErrors: Boolean, argsMap: Map[Symbol, Any]): Option[String] = {
108108
if (hasErrors)
109109
Some("error")
110-
else if (ArgsMap.isNotFalse(argsMap, '_warning))
110+
else if (ArgsMap.isNotFalse(argsMap, Symbol("_warning")))
111111
Some("warning")
112-
else if (ArgsMap.isNotFalse(argsMap, '_success))
112+
else if (ArgsMap.isNotFalse(argsMap, Symbol("_success")))
113113
Some("success")
114114
else
115115
None
116116
}
117117

118118
/* Generates automatically the input attributes for the constraints of a field */
119119
def constraintsArgs(field: Field, msgsProv: MessagesProvider): Seq[(Symbol, Any)] = field.constraints.map {
120-
case ("constraint.required", params) => Some(('required -> true))
121-
case ("constraint.min", params: Seq[Any]) => Some(('min -> msgsProv.messages(params.head.toString)))
122-
case ("constraint.max", params: Seq[Any]) => Some(('max -> msgsProv.messages(params.head.toString)))
123-
case ("constraint.minLength", params: Seq[Any]) => Some(('minlength -> msgsProv.messages(params.head.toString)))
124-
case ("constraint.maxLength", params: Seq[Any]) => Some(('maxlength -> msgsProv.messages(params.head.toString)))
120+
case ("constraint.required", params) => Some((Symbol("required") -> true))
121+
case ("constraint.min", params: Seq[Any]) => Some((Symbol("min") -> msgsProv.messages(params.head.toString)))
122+
case ("constraint.max", params: Seq[Any]) => Some((Symbol("max") -> msgsProv.messages(params.head.toString)))
123+
case ("constraint.minLength", params: Seq[Any]) => Some((Symbol("minlength") -> msgsProv.messages(params.head.toString)))
124+
case ("constraint.maxLength", params: Seq[Any]) => Some((Symbol("maxlength") -> msgsProv.messages(params.head.toString)))
125125
case ("constraint.pattern", params: Seq[Any]) => params.head match {
126-
case str: String => Some(('pattern -> msgsProv.messages(str)))
127-
case func: Function0[_] => Some(('pattern -> msgsProv.messages(func.asInstanceOf[() => scala.util.matching.Regex]().toString)))
126+
case str: String => Some((Symbol("pattern") -> msgsProv.messages(str)))
127+
case func: Function0[_] => Some((Symbol("pattern") -> msgsProv.messages(func.asInstanceOf[() => scala.util.matching.Regex]().toString)))
128128
case _ => None
129129
}
130130
case _ => None
@@ -154,7 +154,7 @@ package object bs {
154154
}
155155

156156
/* Indicates if there is any error */
157-
val hasErrors: Boolean = !errors.isEmpty || ArgsMap.isNotFalse(argsMap, '_error)
157+
val hasErrors: Boolean = !errors.isEmpty || ArgsMap.isNotFalse(argsMap, Symbol("_error"))
158158

159159
/* The optional validation state ("success", "warning" or "error") */
160160
lazy val status: Option[String] = BSFieldInfo.status(hasErrors, argsMap)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@(fieldInfo: b3.B3FieldInfo, inputHtml: Html)(wrap: Html => Html)(implicit fc: b3.B3FieldConstructor)
2-
<div class="form-group @fieldInfo.argsMap.get('_class) @fieldInfo.statusWithFeedback" id="@fieldInfo.idFormField">
2+
<div class="form-group @fieldInfo.argsMap.get(Symbol("_class")) @fieldInfo.statusWithFeedback" id="@fieldInfo.idFormField">
33
@wrap {
44
@inputHtml
55
@fieldInfo.errorsAndInfos.map { case (id, text) =>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
@(contentHtml: Html, argsMap: Map[Symbol, Any])(wrap: Html => Html)(implicit messages: MessagesProvider)
2-
@defining(argsMap.get('_id).map(_.toString).orElse(argsMap.get('id).map(_.toString + "_field"))) { idFormField =>
3-
<div class="form-group @argsMap.get('_class)" @idFormField.map{id=>id="@id"}>
2+
@defining(argsMap.get(Symbol("_id")).map(_.toString).orElse(argsMap.get(Symbol("id")).map(_.toString + "_field"))) { idFormField =>
3+
<div class="form-group @argsMap.get(Symbol("_class"))" @idFormField.map{id=>id="@id"}>
44
@wrap {
55
@contentHtml
6-
@argsMap.get('_help).map { help =>
6+
@argsMap.get(Symbol("_help")).map { help =>
77
<span class="help-block">@bs.Args.msg(help)(messages)</span>
88
}
99
}

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
@(field: Field, args: (Symbol,Any)*)(implicit fc: b3.B3FieldConstructor, messages: MessagesProvider)
22
@defining({
33
val argsMap = args.toMap
4-
val value = argsMap.get('value).getOrElse("true").toString
5-
val checked = argsMap.get('checked).orElse(field.value.map(_ == value).orElse(argsMap.get('_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)
4+
val value = argsMap.get(Symbol("value")).getOrElse("true").toString
5+
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(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), 'checked -> checked, '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)>
15-
@argsMap.get('_text).map(bs.Args.msg(_)(messages))
15+
@argsMap.get(Symbol("_text")).map(bs.Args.msg(_)(messages))
1616
</label>
1717
@if(containsReadonly) {
1818
<input type="hidden" name="@fieldInfo.name" value="@{fieldInfo.value.getOrElse(if (checked) value else "")}"@if(!disabled){ disabled}/>

‎play27-bootstrap3/module/app/views/b3/clear/package.scala‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,11 @@ package object clear {
5555
* *********************************************************************************************************************************
5656
*/
5757
def form(action: Call, args: (Symbol, Any)*)(body: ClearFieldConstructor => Html) = {
58-
val cfc = fieldConstructorSpecific(withFeedbackIcons = isTrue(args, '_feedbackIcons))
58+
val cfc = fieldConstructorSpecific(withFeedbackIcons = isTrue(args, Symbol("_feedbackIcons")))
5959
views.html.b3.form(action, inner(args): _*)(body(cfc))(cfc)
6060
}
6161
def formCSRF(action: Call, args: (Symbol, Any)*)(body: ClearFieldConstructor => Html)(implicit request: RequestHeader) = {
62-
val cfc = fieldConstructorSpecific(withFeedbackIcons = isTrue(args, '_feedbackIcons))
62+
val cfc = fieldConstructorSpecific(withFeedbackIcons = isTrue(args, Symbol("_feedbackIcons")))
6363
views.html.b3.formCSRF(action, inner(args): _*)(body(cfc))(cfc, request)
6464
}
6565

‎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, '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: 2 additions & 2 deletions
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 =>
3-
@argsMap.get('_label).map { label =>
4-
<label class="control-label @colLabel@if(bs.ArgsMap.isTrue(argsMap, '_hideLabel)){ sr-only}">@bs.Args.msg(label)(messages)</label>
3+
@argsMap.get(Symbol("_label")).map { 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/horizontal/package.scala‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,11 @@ package object horizontal {
6161
* *********************************************************************************************************************************
6262
*/
6363
def form(action: Call, colLabel: String, colInput: String, args: (Symbol, Any)*)(body: HorizontalFieldConstructor => Html) = {
64-
val hfc = fieldConstructorSpecific(colLabel, colInput, withFeedbackIcons = isTrue(args, '_feedbackIcons))
64+
val hfc = fieldConstructorSpecific(colLabel, colInput, withFeedbackIcons = isTrue(args, Symbol("_feedbackIcons")))
6565
views.html.b3.form(action, inner(args): _*)(body(hfc))(hfc)
6666
}
6767
def formCSRF(action: Call, colLabel: String, colInput: String, args: (Symbol, Any)*)(body: HorizontalFieldConstructor => Html)(implicit request: RequestHeader) = {
68-
val hfc = fieldConstructorSpecific(colLabel, colInput, withFeedbackIcons = isTrue(args, '_feedbackIcons))
68+
val hfc = fieldConstructorSpecific(colLabel, colInput, withFeedbackIcons = isTrue(args, Symbol("_feedbackIcons")))
6969
views.html.b3.formCSRF(action, inner(args): _*)(body(hfc))(hfc, request)
7070
}
7171

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

Lines changed: 2 additions & 2 deletions
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 =>
3-
@argsMap.get('_label).map { label =>
4-
<label class="control-label@if(bs.ArgsMap.isTrue(argsMap, '_hideLabel)){ sr-only}">@bs.Args.msg(label)(messages)</label>
3+
@argsMap.get(Symbol("_label")).map { 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/inline/package.scala‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,11 @@ package object inline {
5555
* *********************************************************************************************************************************
5656
*/
5757
def form(action: Call, args: (Symbol, Any)*)(body: InlineFieldConstructor => Html) = {
58-
val ifc = fieldConstructorSpecific(withFeedbackIcons = isTrue(args, '_feedbackTooltip))
58+
val ifc = fieldConstructorSpecific(withFeedbackIcons = isTrue(args, Symbol("_feedbackTooltip")))
5959
views.html.b3.form(action, inner(args): _*)(body(ifc))(ifc)
6060
}
6161
def formCSRF(action: Call, args: (Symbol, Any)*)(body: InlineFieldConstructor => Html)(implicit request: RequestHeader) = {
62-
val ifc = fieldConstructorSpecific(withFeedbackIcons = isTrue(args, '_feedbackTooltip))
62+
val ifc = fieldConstructorSpecific(withFeedbackIcons = isTrue(args, Symbol("_feedbackTooltip")))
6363
views.html.b3.formCSRF(action, inner(args): _*)(body(ifc))(ifc, request)
6464
}
6565

0 commit comments

Comments
 (0)