Changeset 3646 for branches/1.2/gui/scripts/choiceentry.tcl

Timestamp:

May 14, 2013 2:33:22 PM (11 years ago)

Author:

gah

Message:

add string trim to inputs

File:

• branches/1.2/gui/scripts/choiceentry.tcl (modified) (6 diffs)

branches/1.2/gui/scripts/choiceentry.tcl

@@ -136 +136 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::ChoiceEntry::label {} {
-    set label [$_owner xml get $_path.about.label]
+    set label [string trim [$_owner xml get $_path.about.label]]
     if {"" == $label} {
         set label "Choice"
@@ -193 +193 @@
                 $_owner notify add $this $cntl [itcl::code $this _rebuild]
 
-                set label [$_owner xml get $_path.$cname.about.label]
+                set label \
+                    [string trim [$_owner xml get $_path.$cname.about.label]]
                 if {"" == $label} {
                     set label "%type #%n"
@@ -208 +209 @@
                         set subst(%id) [$_owner xml element -as id $leading.$ccname]
                         foreach detail [$_owner xml children $leading.$ccname] {
-                            set subst(%$detail) [$_owner xml get $leading.$ccname.$detail]
+                            set subst(%$detail) \
+                                [$_owner xml get $leading.$ccname.$detail]
                         }
                         set str [string map [array get subst] $label]
@@ -226 +228 @@
             #
             set val [string trim [$_owner xml get $_path.$cname.value]]
-            set str [$_owner xml get $_path.$cname.about.label]
+            set str [string trim [$_owner xml get $_path.$cname.about.label]]
             if {"" == $val} {
                 set val $str
@@ -276 +278 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::ChoiceEntry::_tooltip {} {
-    set tip [$_owner xml get $_path.about.description]
+    set tip [string trim [$_owner xml get $_path.about.description]]
 
     # get the description for the current choice, if there is one
@@ -283 +285 @@
     set desc ""
     if {$path != ""} {
-        set desc [$_owner xml get $path.about.description]
+        set desc [string trim [$_owner xml get $path.about.description]]
     }