From 23cead686ea181098b9d602df5a2737387bad90c Mon Sep 17 00:00:00 2001
From: Frederic Massart <fred@moodle.com>
Date: Thu, 27 Mar 2014 15:49:45 +0800
Subject: [PATCH] MDL-44808 atto_table: Remove accessibility information from
 dialogue

---
 lib/editor/atto/plugins/table/lang/en/atto_table.php          | 1 -
 .../moodle-atto_table-button-debug.js                         | 3 +--
 .../moodle-atto_table-button/moodle-atto_table-button-min.js  | 4 ++--
 .../moodle-atto_table-button/moodle-atto_table-button.js      | 3 +--
 lib/editor/atto/plugins/table/yui/src/button/js/button.js     | 3 +--
 lib/editor/atto/styles.css                                    | 2 +-
 6 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/lib/editor/atto/plugins/table/lang/en/atto_table.php b/lib/editor/atto/plugins/table/lang/en/atto_table.php
index 388e14e3690..d05c6c955a6 100644
--- a/lib/editor/atto/plugins/table/lang/en/atto_table.php
+++ b/lib/editor/atto/plugins/table/lang/en/atto_table.php
@@ -22,7 +22,6 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-$string['accessibilityhint'] = '<h3>Accessible tables recommendation</h3><p>An accessible HTML table should have :<ul><li>a caption describing the content of the table</li><li>row and/or column headers</li><li>no empty table headers</li><li>no merged table cells</li></ul>.</p>';
 $string['createtable'] = 'Create table';
 $string['pluginname'] = 'Table';
 $string['numberofcolumns'] = 'Number of columns';
diff --git a/lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button-debug.js b/lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button-debug.js
index 9cf781fbf86..68f8fa05535 100644
--- a/lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button-debug.js
+++ b/lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button-debug.js
@@ -56,8 +56,7 @@ var COMPONENT = 'atto_table',
                 '<br/>' +
                 '<button class="submit" type="submit">{{get_string "createtable" component}}</button>' +
             '</div>' +
-        '</form>' +
-        '<hr/>{{{get_string "accessibilityhint" component}}}',
+        '</form>',
     CONTEXTMENUTEMPLATE = '' +
         '<ul>' +
             '<li><a href="#" data-change="addcolumnafter">{{get_string "addcolumnafter" component}}</a></li>' +
diff --git a/lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button-min.js b/lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button-min.js
index da3625dce3d..545750d1cba 100644
--- a/lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button-min.js
+++ b/lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button-min.js
@@ -1,2 +1,2 @@
-YUI.add("moodle-atto_table-button",function(e,t){var n="atto_table",r='<form class="atto_form"><label for="{{elementid}}_atto_table_caption">{{get_string "caption" component}}</label><textarea class="caption" id="{{elementid}}_atto_table_caption" rows="4" class="fullwidth" required></textarea><br/><label for="{{elementid}}_atto_table_headers" class="sameline">{{get_string "headers" component}}</label><select class="headers" id="{{elementid}}_atto_table_headers"><option value="columns">{{get_string "columns" component}}</option><option value="rows">{{get_string "rows" component}}</option><option value="both">{{get_string "both" component}}</option></select><br/><label for="{{elementid}}_atto_table_rows" class="sameline">{{get_string "numberofrows" component}}</label><input class="rows" type="number" value="3" id="{{elementid}}_atto_table_rows" size="8" min="1" max="50"/><br/><label for="{{elementid}}_atto_table_columns" class="sameline">{{get_string "numberofcolumns" component}}</label><input class="columns" type="number" value="3" id="{{elementid}}_atto_table_columns" size="8" min="1" max="20"/><br/><div class="mdl-align"><br/><button class="submit" type="submit">{{get_string "createtable" component}}</button></div></form><hr/>{{{get_string "accessibilityhint" component}}}',i='<ul><li><a href="#" data-change="addcolumnafter">{{get_string "addcolumnafter" component}}</a></li><li><a href="#" data-change="addrowafter">{{get_string "addrowafter" component}}</a></li><li><a href="#" data-change="moverowup">{{get_string "moverowup" component}}</a></li><li><a href="#" data-change="moverowdown">{{get_string "moverowdown" component}}</a></li><li><a href="#" data-change="movecolumnleft">{{get_string "movecolumnleft" component}}</a></li><li><a href="#" data-change="movecolumnright">{{get_string "movecolumnright" component}}</a></li><li><a href="#" data-change="deleterow">{{get_string "deleterow" component}}</a></li><li><a href="#" data-change="deletecolumn">{{get_string "deletecolumn" component}}</a></li></ul>';CSS={},e.namespace("M.atto_table").Button=e.Base.create("button",e.M.editor_atto.EditorPlugin,[],{_currentSelection:null,_contextMenu:null,_lastTarget:null,initializer:function(){this.addButton({icon:"e/table",callback:this._displayTableEditor,tags:"table"}),e.UA.gecko&&(document.execCommand("enableInlineTableEditing",!1,!1),document.execCommand("enableObjectResizing",!1,!1))},_displayDialogue:function(){this._currentSelection=this.get("host").getSelection();if(this._currentSelection!==!1&&!this._currentSelection.collapsed){var e=this.getDialogue({headerContent:M.util.get_string("createtable",n),focusAfterHide:!0});e.set("bodyContent",this._getDialogueContent()).show()}},_displayTableEditor:function(t){var n=this.get("host").getSelectionParentNode(),r;return n?(e.one(n).ancestors("th, td",!0).each(function(e){this.editor.contains(e)&&(r=e)},this),r?(t.tableCell=r,this._showTableMenu(t)):this._displayDialogue(t)):this._displayDialogue(t)},_getDialogueContent:function(){var t=e.Handlebars.compile(r);return this._content=e.Node.create(t({CSS:CSS,elementid:this.get("host").get("elementid"),component:n})),this._content.one(".submit").on("click",this._setTable,this),this._content},_setTable:function(t){var n,r,i,s,o,u,a;t.preventDefault(),this.getDialogue({focusAfterHide:null}).hide(),n=t.currentTarget.ancestor(".atto_form").one(".caption"),r=t.currentTarget.ancestor(".atto_form").one(".rows"),i=t.currentTarget.ancestor(".atto_form").one(".columns"),s=t.currentTarget.ancestor(".atto_form").one(".headers"),this.get("host").setSelection(this._currentSelection);var f="\n";o="<br/>"+f+"<table>"+f,o+="<caption>"+e.Escape.html(n.get("value"))+"</caption>"+f,u=0;if(s.get("value")==="columns"||s.get("value")==="both"){u=1,o+="<thead>"+f+"<tr>"+f;for(a=0;a<parseInt(i.get("value"),10);a++)o+='<th scope="col"></th>'+f;o+="</tr>"+f+"</thead>"+f}o+="<tbody>"+f;for(;u<parseInt(r.get("value"),10);u++){o+="<tr>"+f;for(a=0;a<parseInt(i.get("value"),10);a++)a!==0||s.get("value")!=="rows"&&s.get("value")!=="both"?o+="<td></td>"+f:o+='<th scope="row"></th>'+f;o+="</tr>"+f}o+="</tbody>"+f,o+="</table>"+f+"<br/>",this.get("host").insertContentAtFocusPoint(o),this.markUpdated()},_showTableMenu:function(t){t.preventDefault();var r;if(!this._contextMenu){var s=e.Handlebars.compile(i),o=e.Node.create(s({elementid:this.get("host").get("elementid"),component:n}));this._contextMenu=new e.M.editor_atto.Menu({headerText:M.util.get_string("edittable","atto_table"),bodyContent:o}),r=this._contextMenu.get("boundingBox"),r.delegate("click",this._handleTableChange,"a",this),r.delegate("key",this._handleTableChange,"down:enter,space","a",this)}r=this._contextMenu.get("boundingBox"),this._lastTarget=t.tableCell.ancestor(".editor_atto_content td, .editor_atto_content th",!0),this._contextMenu.show(),this._contextMenu.align(t.tableCell,[e.WidgetPositionAlign.TL,e.WidgetPositionAlign.BL]),r.one("a")&&r.one("a").focus()},_handleTableChange:function(e){e.preventDefault(),this._contextMenu.hide();switch(e.target.getData("change")){case"addcolumnafter":this._addColumnAfter();break;case"addrowafter":this._addRowAfter();break;case"deleterow":this._deleteRow();break;case"deletecolumn":this._deleteColumn();break;case"moverowdown":this._moveRowDown();break;case"moverowup":this._moveRowUp();break;case"movecolumnleft":this._moveColumnLeft();break;case"movecolumnright":this._moveColumnRight()}},_getRowIndex:function(e){var t=e.ancestor("table"),n=e.ancestor("tr");if(!t||!n)return;var r=t.all("tr");return r.indexOf(n)},_getColumnIndex:function(e){var t=e.ancestor("tr");if(!t)return;var n=t.all("td, th");return n.indexOf(e)},_deleteRow:function(){var e=this._lastTarget.ancestor("tr");e&&e.one("td")&&e.remove(!0),this.markUpdated()},_moveRowUp:function(){var e=this._lastTarget.ancestor("tr"),t=e.previous("tr");if(!e||!t)return;e.swap(t),this.markUpdated()},_moveColumnLeft:function(){var t=this._getColumnIndex(this._lastTarget),n=this._lastTarget.ancestor
-("table").all("tr"),r=new e.NodeList,i=new e.NodeList,s=!1;n.each(function(e){var n=e.all("td, th"),o=n.item(t),u=n.item(t-1);r.push(o),u&&(u.get("tagName")==="TD"&&(s=!0),i.push(u))});if(s&&i.size()>0){var o=0;for(o=0;o<r.size();o++){var u=r.item(o),a=i.item(o);u.swap(a)}}this.markUpdated()},_moveColumnRight:function(){var t=this._getColumnIndex(this._lastTarget),n=this._lastTarget.ancestor("table").all("tr"),r=new e.NodeList,i=new e.NodeList,s=!1;n.each(function(e){var n=e.all("td, th"),o=n.item(t),u=n.item(t+1);o.get("tagName")==="TD"&&(s=!0),r.push(o),u&&i.push(u)});if(s&&i.size()>0){var o=0;for(o=0;o<r.size();o++){var u=r.item(o),a=i.item(o);u.swap(a)}}this.markUpdated()},_moveRowDown:function(){var e=this._lastTarget.ancestor("tr"),t=e.next("tr");if(!e||!t)return;e.swap(t),this.markUpdated()},_deleteColumn:function(){var t=this._getColumnIndex(this._lastTarget),n=this._lastTarget.ancestor("table").all("tr"),r=new e.NodeList,i=!1;n.each(function(e){var n=e.all("td, th"),s=n.item(t);s.get("tagName")==="TD"&&(i=!0),r.push(s)}),i&&r.remove(!0),this.markUpdated()},_addRowAfter:function(){var t=this._getRowIndex(this._lastTarget),n=this._lastTarget.ancestor("table").one("tbody");n||(n=this._lastTarget.ancestor("table"),t+=1);var r=n.one("tr");r||(r=this._lastTarget.ancestor("table").one("tr"));if(!r)return;newrow=r.cloneNode(!0),newrow.all("th, td").each(function(t){if(t.get("tagName")==="TH"&&t.getAttribute("scope")!=="row"){var n=e.Node.create("<td></td>");t.replace(n),t=n}t.setHTML("&nbsp;")}),n.insert(newrow,t),this.markUpdated()},_addColumnAfter:function(){var t=this._getColumnIndex(this._lastTarget),n=this._lastTarget.ancestor("table"),r=n.all("tr");e.each(r,function(e){var n=e.one("td, th").cloneNode(!0);n.setHTML("&nbsp;"),e.insert(n,t+1)},this),this.markUpdated()}})},"@VERSION@",{requires:["moodle-editor_atto-plugin","moodle-editor_atto-menu","event","event-valuechange"]});
+YUI.add("moodle-atto_table-button",function(e,t){var n="atto_table",r='<form class="atto_form"><label for="{{elementid}}_atto_table_caption">{{get_string "caption" component}}</label><textarea class="caption" id="{{elementid}}_atto_table_caption" rows="4" class="fullwidth" required></textarea><br/><label for="{{elementid}}_atto_table_headers" class="sameline">{{get_string "headers" component}}</label><select class="headers" id="{{elementid}}_atto_table_headers"><option value="columns">{{get_string "columns" component}}</option><option value="rows">{{get_string "rows" component}}</option><option value="both">{{get_string "both" component}}</option></select><br/><label for="{{elementid}}_atto_table_rows" class="sameline">{{get_string "numberofrows" component}}</label><input class="rows" type="number" value="3" id="{{elementid}}_atto_table_rows" size="8" min="1" max="50"/><br/><label for="{{elementid}}_atto_table_columns" class="sameline">{{get_string "numberofcolumns" component}}</label><input class="columns" type="number" value="3" id="{{elementid}}_atto_table_columns" size="8" min="1" max="20"/><br/><div class="mdl-align"><br/><button class="submit" type="submit">{{get_string "createtable" component}}</button></div></form>',i='<ul><li><a href="#" data-change="addcolumnafter">{{get_string "addcolumnafter" component}}</a></li><li><a href="#" data-change="addrowafter">{{get_string "addrowafter" component}}</a></li><li><a href="#" data-change="moverowup">{{get_string "moverowup" component}}</a></li><li><a href="#" data-change="moverowdown">{{get_string "moverowdown" component}}</a></li><li><a href="#" data-change="movecolumnleft">{{get_string "movecolumnleft" component}}</a></li><li><a href="#" data-change="movecolumnright">{{get_string "movecolumnright" component}}</a></li><li><a href="#" data-change="deleterow">{{get_string "deleterow" component}}</a></li><li><a href="#" data-change="deletecolumn">{{get_string "deletecolumn" component}}</a></li></ul>';CSS={},e.namespace("M.atto_table").Button=e.Base.create("button",e.M.editor_atto.EditorPlugin,[],{_currentSelection:null,_contextMenu:null,_lastTarget:null,initializer:function(){this.addButton({icon:"e/table",callback:this._displayTableEditor,tags:"table"}),e.UA.gecko&&(document.execCommand("enableInlineTableEditing",!1,!1),document.execCommand("enableObjectResizing",!1,!1))},_displayDialogue:function(){this._currentSelection=this.get("host").getSelection();if(this._currentSelection!==!1&&!this._currentSelection.collapsed){var e=this.getDialogue({headerContent:M.util.get_string("createtable",n),focusAfterHide:!0});e.set("bodyContent",this._getDialogueContent()).show()}},_displayTableEditor:function(t){var n=this.get("host").getSelectionParentNode(),r;return n?(e.one(n).ancestors("th, td",!0).each(function(e){this.editor.contains(e)&&(r=e)},this),r?(t.tableCell=r,this._showTableMenu(t)):this._displayDialogue(t)):this._displayDialogue(t)},_getDialogueContent:function(){var t=e.Handlebars.compile(r);return this._content=e.Node.create(t({CSS:CSS,elementid:this.get("host").get("elementid"),component:n})),this._content.one(".submit").on("click",this._setTable,this),this._content},_setTable:function(t){var n,r,i,s,o,u,a;t.preventDefault(),this.getDialogue({focusAfterHide:null}).hide(),n=t.currentTarget.ancestor(".atto_form").one(".caption"),r=t.currentTarget.ancestor(".atto_form").one(".rows"),i=t.currentTarget.ancestor(".atto_form").one(".columns"),s=t.currentTarget.ancestor(".atto_form").one(".headers"),this.get("host").setSelection(this._currentSelection);var f="\n";o="<br/>"+f+"<table>"+f,o+="<caption>"+e.Escape.html(n.get("value"))+"</caption>"+f,u=0;if(s.get("value")==="columns"||s.get("value")==="both"){u=1,o+="<thead>"+f+"<tr>"+f;for(a=0;a<parseInt(i.get("value"),10);a++)o+='<th scope="col"></th>'+f;o+="</tr>"+f+"</thead>"+f}o+="<tbody>"+f;for(;u<parseInt(r.get("value"),10);u++){o+="<tr>"+f;for(a=0;a<parseInt(i.get("value"),10);a++)a!==0||s.get("value")!=="rows"&&s.get("value")!=="both"?o+="<td></td>"+f:o+='<th scope="row"></th>'+f;o+="</tr>"+f}o+="</tbody>"+f,o+="</table>"+f+"<br/>",this.get("host").insertContentAtFocusPoint(o),this.markUpdated()},_showTableMenu:function(t){t.preventDefault();var r;if(!this._contextMenu){var s=e.Handlebars.compile(i),o=e.Node.create(s({elementid:this.get("host").get("elementid"),component:n}));this._contextMenu=new e.M.editor_atto.Menu({headerText:M.util.get_string("edittable","atto_table"),bodyContent:o}),r=this._contextMenu.get("boundingBox"),r.delegate("click",this._handleTableChange,"a",this),r.delegate("key",this._handleTableChange,"down:enter,space","a",this)}r=this._contextMenu.get("boundingBox"),this._lastTarget=t.tableCell.ancestor(".editor_atto_content td, .editor_atto_content th",!0),this._contextMenu.show(),this._contextMenu.align(t.tableCell,[e.WidgetPositionAlign.TL,e.WidgetPositionAlign.BL]),r.one("a")&&r.one("a").focus()},_handleTableChange:function(e){e.preventDefault(),this._contextMenu.hide();switch(e.target.getData("change")){case"addcolumnafter":this._addColumnAfter();break;case"addrowafter":this._addRowAfter();break;case"deleterow":this._deleteRow();break;case"deletecolumn":this._deleteColumn();break;case"moverowdown":this._moveRowDown();break;case"moverowup":this._moveRowUp();break;case"movecolumnleft":this._moveColumnLeft();break;case"movecolumnright":this._moveColumnRight()}},_getRowIndex:function(e){var t=e.ancestor("table"),n=e.ancestor("tr");if(!t||!n)return;var r=t.all("tr");return r.indexOf(n)},_getColumnIndex:function(e){var t=e.ancestor("tr");if(!t)return;var n=t.all("td, th");return n.indexOf(e)},_deleteRow:function(){var e=this._lastTarget.ancestor("tr");e&&e.one("td")&&e.remove(!0),this.markUpdated()},_moveRowUp:function(){var e=this._lastTarget.ancestor("tr"),t=e.previous("tr");if(!e||!t)return;e.swap(t),this.markUpdated()},_moveColumnLeft:function(){var t=this._getColumnIndex(this._lastTarget),n=this._lastTarget.ancestor("table").all("tr"),r=new e.NodeList,i=new e.NodeList
+,s=!1;n.each(function(e){var n=e.all("td, th"),o=n.item(t),u=n.item(t-1);r.push(o),u&&(u.get("tagName")==="TD"&&(s=!0),i.push(u))});if(s&&i.size()>0){var o=0;for(o=0;o<r.size();o++){var u=r.item(o),a=i.item(o);u.swap(a)}}this.markUpdated()},_moveColumnRight:function(){var t=this._getColumnIndex(this._lastTarget),n=this._lastTarget.ancestor("table").all("tr"),r=new e.NodeList,i=new e.NodeList,s=!1;n.each(function(e){var n=e.all("td, th"),o=n.item(t),u=n.item(t+1);o.get("tagName")==="TD"&&(s=!0),r.push(o),u&&i.push(u)});if(s&&i.size()>0){var o=0;for(o=0;o<r.size();o++){var u=r.item(o),a=i.item(o);u.swap(a)}}this.markUpdated()},_moveRowDown:function(){var e=this._lastTarget.ancestor("tr"),t=e.next("tr");if(!e||!t)return;e.swap(t),this.markUpdated()},_deleteColumn:function(){var t=this._getColumnIndex(this._lastTarget),n=this._lastTarget.ancestor("table").all("tr"),r=new e.NodeList,i=!1;n.each(function(e){var n=e.all("td, th"),s=n.item(t);s.get("tagName")==="TD"&&(i=!0),r.push(s)}),i&&r.remove(!0),this.markUpdated()},_addRowAfter:function(){var t=this._getRowIndex(this._lastTarget),n=this._lastTarget.ancestor("table").one("tbody");n||(n=this._lastTarget.ancestor("table"),t+=1);var r=n.one("tr");r||(r=this._lastTarget.ancestor("table").one("tr"));if(!r)return;newrow=r.cloneNode(!0),newrow.all("th, td").each(function(t){if(t.get("tagName")==="TH"&&t.getAttribute("scope")!=="row"){var n=e.Node.create("<td></td>");t.replace(n),t=n}t.setHTML("&nbsp;")}),n.insert(newrow,t),this.markUpdated()},_addColumnAfter:function(){var t=this._getColumnIndex(this._lastTarget),n=this._lastTarget.ancestor("table"),r=n.all("tr");e.each(r,function(e){var n=e.one("td, th").cloneNode(!0);n.setHTML("&nbsp;"),e.insert(n,t+1)},this),this.markUpdated()}})},"@VERSION@",{requires:["moodle-editor_atto-plugin","moodle-editor_atto-menu","event","event-valuechange"]});
diff --git a/lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button.js b/lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button.js
index 9cf781fbf86..68f8fa05535 100644
--- a/lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button.js
+++ b/lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button.js
@@ -56,8 +56,7 @@ var COMPONENT = 'atto_table',
                 '<br/>' +
                 '<button class="submit" type="submit">{{get_string "createtable" component}}</button>' +
             '</div>' +
-        '</form>' +
-        '<hr/>{{{get_string "accessibilityhint" component}}}',
+        '</form>',
     CONTEXTMENUTEMPLATE = '' +
         '<ul>' +
             '<li><a href="#" data-change="addcolumnafter">{{get_string "addcolumnafter" component}}</a></li>' +
diff --git a/lib/editor/atto/plugins/table/yui/src/button/js/button.js b/lib/editor/atto/plugins/table/yui/src/button/js/button.js
index f0e52b76d44..ac4cbc2e90b 100644
--- a/lib/editor/atto/plugins/table/yui/src/button/js/button.js
+++ b/lib/editor/atto/plugins/table/yui/src/button/js/button.js
@@ -54,8 +54,7 @@ var COMPONENT = 'atto_table',
                 '<br/>' +
                 '<button class="submit" type="submit">{{get_string "createtable" component}}</button>' +
             '</div>' +
-        '</form>' +
-        '<hr/>{{{get_string "accessibilityhint" component}}}',
+        '</form>',
     CONTEXTMENUTEMPLATE = '' +
         '<ul>' +
             '<li><a href="#" data-change="addcolumnafter">{{get_string "addcolumnafter" component}}</a></li>' +
diff --git a/lib/editor/atto/styles.css b/lib/editor/atto/styles.css
index a754ce555e8..9fc447aea0f 100644
--- a/lib/editor/atto/styles.css
+++ b/lib/editor/atto/styles.css
@@ -137,7 +137,7 @@ div.editor_atto_toolbar div.atto_group {
 }
 .atto_form label {
     display: block;
-    margin: 5px;
+    margin: 0 0 5px 0;
 }
 
 /* RTL Rules */