Replaced dojoAttachEvent and dojoAttachPoint w HTML5 valid attributes.
authorJoseph Lewis <joehms22@gmail.com>
Thu, 5 Jul 2012 16:22:38 +0000 (10:22 -0600)
committerJoseph Lewis <joehms22@gmail.com>
Thu, 5 Jul 2012 16:22:38 +0000 (10:22 -0600)
"dojoAttachEvent" -> "data-dojo-attach-event"
"dojoAttachPoint" -> "data-dojo-attach-point"

Signed-off-by: Joseph Lewis <joehms22@gmail.com>
Open-ILS/web/js/dojo/openils/widget/FacetSidebar.js
Open-ILS/web/js/dojo/openils/widget/Searcher.js
Open-ILS/web/js/dojo/openils/widget/Textarea.js
Open-ILS/web/js/dojo/openils/widget/TranslatorPopup.js

index 98bc0a0..2241e7b 100644 (file)
@@ -59,7 +59,7 @@ if(!dojo._hasResource["openils.widget.FacetSidebar"]) {
         [dijit._Widget, dijit._Templated],
         {   
 
-            templateString : '<div dojoAttachPoint="myTop"><div dojoAttachPoint="containerNode"></div><div class="facetClassContainer" dojoAttachPoint="facetClasses"></div></div>',
+            templateString : '<div data-dojo-attach-point="myTop"><div data-dojo-attach-point="containerNode"></div><div class="facetClassContainer" data-dojo-attach-point="facetClasses"></div></div>',
             widgetsInTemplate: false,
 
             facetData : {},
@@ -176,8 +176,8 @@ if(!dojo._hasResource["openils.widget.FacetSidebar"]) {
 
             templateString :
 '<div class="facetClassLabelContainer">' +
-'  <div class="facetClassLabel" dojoAttachPoint="facetClassLabel"></div>' +
-'  <div class="facetFieldContainer" dojoAttachPoint="facetFields"></div>' +
+'  <div class="facetClassLabel" data-dojo-attach-point="facetClassLabel"></div>' +
+'  <div class="facetFieldContainer" data-dojo-attach-point="facetFields"></div>' +
 '</div>',
             widgetsInTemplate: false,
 
@@ -221,11 +221,11 @@ if(!dojo._hasResource["openils.widget.FacetSidebar"]) {
         {   
 
             templateString : 
-'<div class="facetField" dojoAttachPoint="myTop">' +
-'  <div class="extraFacetFieldsWrapper" dojoAttachPoint="toggleExtraFacetFieldsWrapper"><button class="toggleExtraFacetFieldsButton" data-dojo-type="dijit.form.Button" dojoAttachPoint="toggleExtraFacetFields" dojoAttachEvent="onClick:toggleExtraFacets"></button></div>' +
-'  <div class="facetFieldLabel" dojoAttachPoint="facetLabel"></div>' +
-'  <div class="facetFields" dojoAttachPoint="facetFields"></div>' +
-'  <div class="facetFields hide_me" dojoAttachPoint="extraFacetFields"></div>' +
+'<div class="facetField" data-dojo-attach-point="myTop">' +
+'  <div class="extraFacetFieldsWrapper" data-dojo-attach-point="toggleExtraFacetFieldsWrapper"><button class="toggleExtraFacetFieldsButton" data-dojo-type="dijit.form.Button" data-dojo-attach-point="toggleExtraFacetFields" data-dojo-attach-event="onClick:toggleExtraFacets"></button></div>' +
+'  <div class="facetFieldLabel" data-dojo-attach-point="facetLabel"></div>' +
+'  <div class="facetFields" data-dojo-attach-point="facetFields"></div>' +
+'  <div class="facetFields hide_me" data-dojo-attach-point="extraFacetFields"></div>' +
 '</div>',
 
             widgetsInTemplate: true,
index 234fd7f..8e6081e 100644 (file)
@@ -41,58 +41,58 @@ if(!dojo._hasResource["openils.widget.Searcher"]) {
         {
 
             templateString : 
-"<div dojoAttachPoint='searcherTopNode'>" +
+"<div data-dojo-attach-point='searcherTopNode'>" +
 
-"  <div dojoAttachPoint='deck'>" +
-"    <div dojoAttachPoint='basicSearch'>" +
-"      <span dojoAttachPoint='containerNode' class='searcherSimpleSearchWrapper'></span>" +
+"  <div data-dojo-attach-point='deck'>" +
+"    <div data-dojo-attach-point='basicSearch'>" +
+"      <span data-dojo-attach-point='containerNode' class='searcherSimpleSearchWrapper'></span>" +
 "    </div>" +
 
-"    <div dojoAttachPoint='advSearch' class='hide_me searcherAdvancedSearchWrapper'>" +
-"      <div dojoAttachPoint='searcherClassedSearchesContainer' class='searcherClassedSearchesContainer hide_me'>" +
-"        <div dojoAttachPoint='classedSearches' class='searcherClassedSearches'>" +
-"          <span dojoAttachPoint='searcherClassedSearchesLabel' class='searcherClassedSearchesLabel'></span>" +
+"    <div data-dojo-attach-point='advSearch' class='hide_me searcherAdvancedSearchWrapper'>" +
+"      <div data-dojo-attach-point='searcherClassedSearchesContainer' class='searcherClassedSearchesContainer hide_me'>" +
+"        <div data-dojo-attach-point='classedSearches' class='searcherClassedSearches'>" +
+"          <span data-dojo-attach-point='searcherClassedSearchesLabel' class='searcherClassedSearchesLabel'></span>" +
 "        </div>" +
 "        <div class='searcherClassedSearchesAddContainer'>" +
-"          <button data-dojo-type='dijit.form.Button' dojoAttachPoint='andClassedSearch' dojoAttachEvent='onClick:addClassAnd'></button>" +
-"          <button data-dojo-type='dijit.form.Button' dojoAttachPoint='orClassedSearch' dojoAttachEvent='onClick:addClassOr'></button>" +
+"          <button data-dojo-type='dijit.form.Button' data-dojo-attach-point='andClassedSearch' data-dojo-attach-event='onClick:addClassAnd'></button>" +
+"          <button data-dojo-type='dijit.form.Button' data-dojo-attach-point='orClassedSearch' data-dojo-attach-event='onClick:addClassOr'></button>" +
 "        </div>" +
 "      </div>" +
 
-"      <div dojoAttachPoint='searcherFacetedSearchesContainer' class='searcherFacetedSearchesContainer hide_me'>" +
-"        <div class='searcherFacetedSearches' dojoAttachPoint='facetedSearches'>" +
-"          <span dojoAttachPoint='searcherFacetedSearchesLabel' class='searcherFacetedSearchesLabel'></span>" +
+"      <div data-dojo-attach-point='searcherFacetedSearchesContainer' class='searcherFacetedSearchesContainer hide_me'>" +
+"        <div class='searcherFacetedSearches' data-dojo-attach-point='facetedSearches'>" +
+"          <span data-dojo-attach-point='searcherFacetedSearchesLabel' class='searcherFacetedSearchesLabel'></span>" +
 "        </div>" +
 "        <span>" +
-"          <button data-dojo-type='dijit.form.Button' dojoAttachPoint='addFacetedSearch' dojoAttachEvent='onClick:addFacet'></button>" +
+"          <button data-dojo-type='dijit.form.Button' data-dojo-attach-point='addFacetedSearch' data-dojo-attach-event='onClick:addFacet'></button>" +
 "        </span>" +
 "      </div>" +
 
-"      <div dojoAttachPoint='searcherFilterModifierContainer' class='searcherFilterModifierContainer hide_me'>" +
+"      <div data-dojo-attach-point='searcherFilterModifierContainer' class='searcherFilterModifierContainer hide_me'>" +
 "        <table width='100%'><tbody><tr>" +
-"          <td dojoAttachPoint='searcherFilterContainer' class='searcherFilterContainer hide_me' valign='top' width='50%'>" +
-"            <div dojoAttachPoint='filters'>" +
-"              <span dojoAttachPoint='searcherFiltersLabel' class='searcherFiltersLabel'></span>" +
+"          <td data-dojo-attach-point='searcherFilterContainer' class='searcherFilterContainer hide_me' valign='top' width='50%'>" +
+"            <div data-dojo-attach-point='filters'>" +
+"              <span data-dojo-attach-point='searcherFiltersLabel' class='searcherFiltersLabel'></span>" +
 "            </div>" +
-"            <button data-dojo-type='dijit.form.Button' dojoAttachPoint='addFilterButton' dojoAttachEvent='onClick:addFilter'></button>" +
+"            <button data-dojo-type='dijit.form.Button' data-dojo-attach-point='addFilterButton' data-dojo-attach-event='onClick:addFilter'></button>" +
 "          </td>" +
-"          <td dojoAttachPoint='searcherModifierContainer' class='searcherModifierContainer hide_me' valign='top' width='50%'>" +
-"            <div dojoAttachPoint='modifiers'>" +
-"              <span dojoAttachPoint='searcherModifiersLabel' class='searcherModifiersLabel'></span>" +
+"          <td data-dojo-attach-point='searcherModifierContainer' class='searcherModifierContainer hide_me' valign='top' width='50%'>" +
+"            <div data-dojo-attach-point='modifiers'>" +
+"              <span data-dojo-attach-point='searcherModifiersLabel' class='searcherModifiersLabel'></span>" +
 "            </div>" +
-"            <button data-dojo-type='dijit.form.Button' dojoAttachPoint='addModifierButton' dojoAttachEvent='onClick:addModifier'></button>" +
+"            <button data-dojo-type='dijit.form.Button' data-dojo-attach-point='addModifierButton' data-dojo-attach-event='onClick:addModifier'></button>" +
 "          </td>" +
 "        </tr></tbody></table>" +
 "      </div>" +
 
 "      <div class='searcherGoContainer'>" +
-"        <span data-dojo-type='dijit.form.Button' dojoAttachPoint='goButton' dojoAttachEvent='onClick:performSearch'></span>" +
+"        <span data-dojo-type='dijit.form.Button' data-dojo-attach-point='goButton' data-dojo-attach-event='onClick:performSearch'></span>" +
 "      </div>" +
 "    </div>" +
 "  </div>" +
 
 "  <div class='searcherDeckSwapContainer'>" +
-"    <span data-dojo-type='dijit.form.Button' dojoAttachPoint='advToggle' dojoAttachEvent='onClick:swapDeck'></span>" +
+"    <span data-dojo-type='dijit.form.Button' data-dojo-attach-point='advToggle' data-dojo-attach-event='onClick:swapDeck'></span>" +
 "  </div>" +
 "</div>",
             widgetsInTemplate: true,
@@ -361,18 +361,18 @@ if(!dojo._hasResource["openils.widget.Searcher"]) {
         {
 
             templateString :
-'<table dojoAttachPoint="myTop" class="modifier"><tbody><tr>' +
+'<table data-dojo-attach-point="myTop" class="modifier"><tbody><tr>' +
 '   <td>' +
-'     <select value="-" name="modifierSelect" dojoAttachPoint="modifierSelect" data-dojo-type="dijit.form.FilteringSelect" >' +
-'       <option dojoAttachPoint="modifierDefault" value="-">-- Select a Modifier --</option>' +
-'       <option dojoAttachPoint="modifierAvailable" value="available"></option>' +
-'       <option dojoAttachPoint="modifierDescending" value="descending"></option>' +
-'       <option dojoAttachPoint="modifierAscending" value="ascending"></option>' +
-'       <option dojoAttachPoint="modifierMetabib" value="metabib"></option>' +
-'       <option dojoAttachPoint="modifierStaff" value="staff"></option>' +
+'     <select value="-" name="modifierSelect" data-dojo-attach-point="modifierSelect" data-dojo-type="dijit.form.FilteringSelect" >' +
+'       <option data-dojo-attach-point="modifierDefault" value="-">-- Select a Modifier --</option>' +
+'       <option data-dojo-attach-point="modifierAvailable" value="available"></option>' +
+'       <option data-dojo-attach-point="modifierDescending" value="descending"></option>' +
+'       <option data-dojo-attach-point="modifierAscending" value="ascending"></option>' +
+'       <option data-dojo-attach-point="modifierMetabib" value="metabib"></option>' +
+'       <option data-dojo-attach-point="modifierStaff" value="staff"></option>' +
 '     </select>' +
 '   </td> ' +
-'   <td dojoAttachPoint="removeWrapper"><span data-dojo-type="dijit.form.Button" dojoAttachPoint="removeButton" dojoAttachEvent="onClick:killMe"></span></td> ' +
+'   <td data-dojo-attach-point="removeWrapper"><span data-dojo-type="dijit.form.Button" data-dojo-attach-point="removeButton" data-dojo-attach-event="onClick:killMe"></span></td> ' +
 '</tr></tbody></table>',
             widgetsInTemplate: true,
 
@@ -407,29 +407,29 @@ if(!dojo._hasResource["openils.widget.Searcher"]) {
         {
 
             templateString :
-'<table dojoAttachPoint="myTop" class="filter"><tbody><tr>' +
+'<table data-dojo-attach-point="myTop" class="filter"><tbody><tr>' +
 '   <td>' +
-'     <select value="-" name="filterSelect" dojoAttachPoint="filterSelect" data-dojo-type="dijit.form.FilteringSelect">' +
-'       <option dojoAttachPoint="filterDefault" value="-">-- Select a Filter --</option>' +
-'       <option dojoAttachPoint="filterSite" value="site">Site</option>' +
-'       <option dojoAttachPoint="filterDepth" value="depth">Search Depth</option>' +
-'       <option dojoAttachPoint="filterSort" value="sort">Sort Axis</option>' +
-'       <option dojoAttachPoint="filterStatuses" value="statuses">Statuses</option>' +
-'       <option dojoAttachPoint="filterAudience" value="audience">Audience</option>' +
-'       <option dojoAttachPoint="filterBefore" value="before">Published Before</option>' +
-'       <option dojoAttachPoint="filterAfter" value="after">Published After</option>' +
-'       <option dojoAttachPoint="filterBetween" value="between">Published Between</option>' +
-'       <option dojoAttachPoint="filterDuring" value="during">In Publication</option>' +
-'       <option dojoAttachPoint="filterForm" value="item_form">Form</option>' +
-'       <option dojoAttachPoint="filterType" value="item_type">Type</option>' +
-'       <option dojoAttachPoint="filterTypeForm" value="format">Type and Form</option>' +
-'       <option dojoAttachPoint="filterVRFormat" value="vr_format">Videorecording Format</option>' +
-'       <option dojoAttachPoint="filterLitForm" value="lit_form">Literary Form</option>' +
-'       <option dojoAttachPoint="filterBibLevel" value="bib_level">Bibliographic Level</option>' +
+'     <select value="-" name="filterSelect" data-dojo-attach-point="filterSelect" data-dojo-type="dijit.form.FilteringSelect">' +
+'       <option data-dojo-attach-point="filterDefault" value="-">-- Select a Filter --</option>' +
+'       <option data-dojo-attach-point="filterSite" value="site">Site</option>' +
+'       <option data-dojo-attach-point="filterDepth" value="depth">Search Depth</option>' +
+'       <option data-dojo-attach-point="filterSort" value="sort">Sort Axis</option>' +
+'       <option data-dojo-attach-point="filterStatuses" value="statuses">Statuses</option>' +
+'       <option data-dojo-attach-point="filterAudience" value="audience">Audience</option>' +
+'       <option data-dojo-attach-point="filterBefore" value="before">Published Before</option>' +
+'       <option data-dojo-attach-point="filterAfter" value="after">Published After</option>' +
+'       <option data-dojo-attach-point="filterBetween" value="between">Published Between</option>' +
+'       <option data-dojo-attach-point="filterDuring" value="during">In Publication</option>' +
+'       <option data-dojo-attach-point="filterForm" value="item_form">Form</option>' +
+'       <option data-dojo-attach-point="filterType" value="item_type">Type</option>' +
+'       <option data-dojo-attach-point="filterTypeForm" value="format">Type and Form</option>' +
+'       <option data-dojo-attach-point="filterVRFormat" value="vr_format">Videorecording Format</option>' +
+'       <option data-dojo-attach-point="filterLitForm" value="lit_form">Literary Form</option>' +
+'       <option data-dojo-attach-point="filterBibLevel" value="bib_level">Bibliographic Level</option>' +
 '     </select>' +
 '   </td> ' +
-'   <td><div dojoAttachPoint="valueList" data-dojo-type="dijit.form.TextBox"></div></td> ' +
-'   <td dojoAttachPoint="removeWrapper"><span data-dojo-type="dijit.form.Button" dojoAttachPoint="removeButton" dojoAttachEvent="onClick:killMe"></span></td> ' +
+'   <td><div data-dojo-attach-point="valueList" data-dojo-type="dijit.form.TextBox"></div></td> ' +
+'   <td data-dojo-attach-point="removeWrapper"><span data-dojo-type="dijit.form.Button" data-dojo-attach-point="removeButton" data-dojo-attach-event="onClick:killMe"></span></td> ' +
 '</tr></tbody></table>',
             widgetsInTemplate: true,
 
@@ -474,11 +474,11 @@ if(!dojo._hasResource["openils.widget.Searcher"]) {
         {
 
             templateString :
-'<table dojoAttachPoint="myTop" class="facetedSearch"><tbody><tr>' +
-'   <td><div dojoAttachPoint="matchIndex" searchAttr="label" data-dojo-type="dijit.form.FilteringSelect" store="openils.widget.Searcher.facetStore"></div></td> ' +
-'   <td><span style="margin-left:10px; margin-right:10px;" dojoAttachPoint="exactOption"></span></td> ' +
-'   <td><div dojoAttachPoint="searchValue" data-dojo-type="dijit.form.TextBox"></div></td> ' +
-'   <td dojoAttachPoint="removeWrapper"><span data-dojo-type="dijit.form.Button" dojoAttachPoint="removeButton" dojoAttachEvent="onClick:killMe"></span></td> ' +
+'<table data-dojo-attach-point="myTop" class="facetedSearch"><tbody><tr>' +
+'   <td><div data-dojo-attach-point="matchIndex" searchAttr="label" data-dojo-type="dijit.form.FilteringSelect" store="openils.widget.Searcher.facetStore"></div></td> ' +
+'   <td><span style="margin-left:10px; margin-right:10px;" data-dojo-attach-point="exactOption"></span></td> ' +
+'   <td><div data-dojo-attach-point="searchValue" data-dojo-type="dijit.form.TextBox"></div></td> ' +
+'   <td data-dojo-attach-point="removeWrapper"><span data-dojo-type="dijit.form.Button" data-dojo-attach-point="removeButton" data-dojo-attach-event="onClick:killMe"></span></td> ' +
 '</tr></tbody></table>',
             widgetsInTemplate: true,
 
@@ -511,18 +511,18 @@ if(!dojo._hasResource["openils.widget.Searcher"]) {
         {
 
             templateString :
-'<table dojoAttachPoint="myTop" class="classedSearch"><tbody><tr>' +
-'   <td colspan="4" align="center"><span dojoAttachPoint="joinerSpan"></span></td></tr><tr> ' +
-'   <td><div dojoAttachPoint="matchIndex" value="keyword" searchAttr="label" data-dojo-type="dijit.form.FilteringSelect" store="openils.widget.Searcher.searchStore"></div></td> ' +
+'<table data-dojo-attach-point="myTop" class="classedSearch"><tbody><tr>' +
+'   <td colspan="4" align="center"><span data-dojo-attach-point="joinerSpan"></span></td></tr><tr> ' +
+'   <td><div data-dojo-attach-point="matchIndex" value="keyword" searchAttr="label" data-dojo-type="dijit.form.FilteringSelect" store="openils.widget.Searcher.searchStore"></div></td> ' +
 '   <td>' +
-'     <select dojoAttachPoint="matchType" data-dojo-type="dijit.form.FilteringSelect" name="matchType">' +
-'       <option dojoAttachPoint="containsOption" value="contains">Contains</option>' +
-'       <option dojoAttachPoint="notContainsOption" value="notcontains">Does Not Contain</option>' +
-'       <option dojoAttachPoint="exactOption" value="exact"> Matches Exactly</option>' +
+'     <select data-dojo-attach-point="matchType" data-dojo-type="dijit.form.FilteringSelect" name="matchType">' +
+'       <option data-dojo-attach-point="containsOption" value="contains">Contains</option>' +
+'       <option data-dojo-attach-point="notContainsOption" value="notcontains">Does Not Contain</option>' +
+'       <option data-dojo-attach-point="exactOption" value="exact"> Matches Exactly</option>' +
 '     </select>' +
 '   </td> ' +
-'   <td><div dojoAttachPoint="searchValue" data-dojo-type="dijit.form.TextBox"></div></td> ' +
-'   <td dojoAttachPoint="removeWrapper"><span data-dojo-type="dijit.form.Button" dojoAttachPoint="removeButton" dojoAttachEvent="onClick:killMe"></span></td> ' +
+'   <td><div data-dojo-attach-point="searchValue" data-dojo-type="dijit.form.TextBox"></div></td> ' +
+'   <td data-dojo-attach-point="removeWrapper"><span data-dojo-type="dijit.form.Button" data-dojo-attach-point="removeButton" data-dojo-attach-event="onClick:killMe"></span></td> ' +
 '</tr></tbody></table>',
             widgetsInTemplate: true,
 
index 2af9f6f..9142015 100644 (file)
@@ -11,7 +11,7 @@ if(!dojo._hasResource['openils.widget.Textarea']) {
         {
             width : '',
             height : '',
-            templateString : '<textarea class="openils-widget-textarea" value="${value}" dojoAttachPoint="formValueNode,editNode,focusNode,styleNode"></textarea>',
+            templateString : '<textarea class="openils-widget-textarea" value="${value}" data-dojo-attach-point="formValueNode,editNode,focusNode,styleNode"></textarea>',
             
             constructor : function(args) {
                 if(!args) args = {};
index ad312d1..f156b08 100644 (file)
@@ -39,7 +39,7 @@ if(!dojo._hasResource["openils.widget.TranslatorPopup"]) {
                [dijit._Widget, dijit._Templated],
                {
 
-                       templateString : "<span id='${field}_translation_${unique}' dojoAttachPoint='containerNode'><div id='${field}_translation_button_${unique}' dojoAttachPoint='translateLabelNode' data-dojo-type='dijit.form.DropDownButton'><span>Translate</span><div id='${field}_translation_tooltip_${unique}' dojoAttachPoint='tooltipDialog' data-dojo-type='dijit.TooltipDialog'><div data-dojo-type='dijit.layout.ContentPane'><table><tbody class='translation_tbody_template' style='display:none; visibility:hidden;'><tr><th dojoAttachPoint='localeLabelNode'/><td class='locale'><div class='locale_combobox'></div></td><th dojoAttachPoint='translationLabelNode'/><td class='translation'><div class='translation_textbox'></div></td><td><button class='create_button' style='display:none; visibility:hidden;'><span dojoAttachPoint='createButtonNode'></span></button><button class='update_button' style='display:none; visibility:hidden;'><span dojoAttachPoint='updateButtonNode'></span></button><button class='delete_button' style='display:none; visibility:hidden;'><span dojoAttachPoint='removeButtonNode'></span></button></td></tr></tbody><tbody class='translation_tbody'></tbody></table></div></div></div></span>",
+                       templateString : "<span id='${field}_translation_${unique}' data-dojo-attach-point='containerNode'><div id='${field}_translation_button_${unique}' data-dojo-attach-point='translateLabelNode' data-dojo-type='dijit.form.DropDownButton'><span>Translate</span><div id='${field}_translation_tooltip_${unique}' data-dojo-attach-point='tooltipDialog' data-dojo-type='dijit.TooltipDialog'><div data-dojo-type='dijit.layout.ContentPane'><table><tbody class='translation_tbody_template' style='display:none; visibility:hidden;'><tr><th data-dojo-attach-point='localeLabelNode'/><td class='locale'><div class='locale_combobox'></div></td><th data-dojo-attach-point='translationLabelNode'/><td class='translation'><div class='translation_textbox'></div></td><td><button class='create_button' style='display:none; visibility:hidden;'><span data-dojo-attach-point='createButtonNode'></span></button><button class='update_button' style='display:none; visibility:hidden;'><span data-dojo-attach-point='updateButtonNode'></span></button><button class='delete_button' style='display:none; visibility:hidden;'><span data-dojo-attach-point='removeButtonNode'></span></button></td></tr></tbody><tbody class='translation_tbody'></tbody></table></div></div></div></span>",
 
                        widgetsInTemplate: true,
                        field : "",