Bug 1562998 - textbox to html input in calendar-unifinder-todo.xul. r=mkmelin,pmorris
authorAlessandro Castellani <alessandro@thunderbird.net>
Wed, 14 Aug 2019 09:16:41 -0700
changeset 27331 91539be83495f83daab9b943d0c238c7fa4d8b49
parent 27330 ecccd8455117a4377ff4727fa6ebe32c6e4849a9
child 27332 2f2113a4e5e4fe6a59eb04296e0a678529a1dc51
push id16287
push usermozilla@jorgk.com
push dateThu, 15 Aug 2019 21:20:38 +0000
treeherdercomm-central@91539be83495 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmkmelin, pmorris
bugs1562998
Bug 1562998 - textbox to html input in calendar-unifinder-todo.xul. r=mkmelin,pmorris
calendar/base/content/calendar-unifinder-todo.xul
calendar/locales/en-US/chrome/calendar/calendar.dtd
--- a/calendar/base/content/calendar-unifinder-todo.xul
+++ b/calendar/base/content/calendar-unifinder-todo.xul
@@ -5,45 +5,44 @@
 
 <!DOCTYPE overlay [
   <!ENTITY % dtd2 SYSTEM "chrome://calendar/locale/calendar.dtd" > %dtd2;
   <!ENTITY % dtd3 SYSTEM "chrome://calendar/locale/calendar-event-dialog.dtd"> %dtd3;
 ]>
 
 <?xml-stylesheet type="text/css" href="chrome://calendar/skin/calendar-task-view.css"?>
 
-<overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml">
+<overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+         xmlns:html="http://www.w3.org/1999/xhtml">
 
+  <script src="chrome://global/content/globalOverlay.js"/>
+  <script src="chrome://global/content/editMenuOverlay.js"/>
   <script src="chrome://calendar/content/calFilter.js"/>
   <script src="chrome://calendar/content/calendar-task-tree-utils.js"/>
   <script src="chrome://calendar/content/calendar-unifinder-todo.js"/>
-  <script src="chrome://global/content/globalOverlay.js"/>
 
   <vbox id="todo-tab-panel" persist="height,collapsed" flex="1">
     <!-- This second vbox means all of this is added to the DOM at once,
          so the label's binding doesn't complain about not having a control. -->
     <vbox flex="1">
-      <box id="todo-label" align="left" collapsed="true">
-        <label flex="1" crop="end" style="font-weight: bold" value="&calendar.unifinder.todoitems.label;" control="unifinder-todo-tree"/>
-      </box>
       <box id="show-completed-checkbox-box" align="center">
         <checkbox id="show-completed-checkbox"
                   label="&calendar.unifinder.showcompletedtodos.label;"
                   flex="1"
                   crop="end"
                   oncommand="updateCalendarToDoUnifinder()"
                   persist="checked"/>
       </box>
       <vbox id="calendar-task-tree-detail" flex="1">
         <tree is="calendar-task-tree-todaypane" id="unifinder-todo-tree"
               flex="1"
               visible-columns="completed priority title"
               persist="visible-columns ordinals widths sort-active sort-direction"
               context="taskitem-context-menu"/>
-        <textbox id="unifinder-task-edit-field"
-                 class="task-edit-field themeableSearchBox"
-                 onfocus="taskEdit.onFocus(event)"
-                 onblur="taskEdit.onBlur(event)"
-                 onkeypress="taskEdit.onKeyPress(event)"/>
+        <html:input id="unifinder-task-edit-field"
+                    class="task-edit-field themeableSearchBox"
+                    onfocus="taskEdit.onFocus(event)"
+                    onblur="taskEdit.onBlur(event)"
+                    onkeypress="taskEdit.onKeyPress(event)"/>
       </vbox>
     </vbox>
   </vbox>
 </overlay>
--- a/calendar/locales/en-US/chrome/calendar/calendar.dtd
+++ b/calendar/locales/en-US/chrome/calendar/calendar.dtd
@@ -4,17 +4,16 @@
 
 <!-- General -->
 <!ENTITY calendar.calendar.label     "Calendar">
 <!ENTITY calendar.calendar.accesskey "C">
 
 <!ENTITY calendar.newevent.button.tooltip         "Create a new event" >
 <!ENTITY calendar.newtask.button.tooltip          "Create a new task" >
 
-<!ENTITY calendar.unifinder.todoitems.label       "Tasks" >
 <!ENTITY calendar.unifinder.showcompletedtodos.label "Show completed Tasks">
 
 <!ENTITY calendar.today.button.label          "Today">
 <!ENTITY calendar.tomorrow.button.label       "Tomorrow">
 <!ENTITY calendar.upcoming.button.label       "Upcoming">
 
 <!ENTITY calendar.events.filter.all.label "All Events">
 <!ENTITY calendar.events.filter.today.label "Today's Events">