commit 3a0f651585500e230e7e95c8375f42e16584c718 Author: Ryan McCabe rmccabe@redhat.com Date: Sat Aug 20 14:25:33 2011 -0400
Reset the forms in lightbox dialogs when they're closed
luci/public/js/shared.js | 9 +++++++++ luci/templates/add_existing.html | 4 ++-- luci/templates/add_node.html | 2 +- luci/templates/create_cluster.html | 2 +- luci/templates/failover.html | 2 +- luci/templates/fence.html | 2 +- luci/templates/node.html | 6 +++--- luci/templates/resource.html | 2 +- luci/templates/service.html | 2 +- 9 files changed, 20 insertions(+), 11 deletions(-) --- diff --git a/luci/public/js/shared.js b/luci/public/js/shared.js index 0aa2595..4bbd36a 100644 --- a/luci/public/js/shared.js +++ b/luci/public/js/shared.js @@ -104,3 +104,12 @@ function update_multi_action(checkbox_obj) { } } } + +/* From jquery.form.js */ +function reset_form(form_elem) { + $(form_elem).each(function() { + if (typeof this.reset == 'function' || (typeof this.reset == 'object' && !this.reset.nodeType)) { + this.reset(); + } + }); +} diff --git a/luci/templates/add_existing.html b/luci/templates/add_existing.html index 0564027..8a6d54e 100644 --- a/luci/templates/add_existing.html +++ b/luci/templates/add_existing.html @@ -21,7 +21,7 @@ </div> <input type="button" class="button formsubmit blue" value="Connect" onclick="add_existing_async(this.form)" /> <input type="button" class="button formsubmit silver" value="Cancel" - onclick="$('#add_existing_dialog').dialog('close')" /> + onclick="$('#add_existing_dialog').dialog('close');reset_form(this.form)" /> </form> </div> </div> @@ -54,7 +54,7 @@ <div class="row"> <input type="submit" class="button formsubmit blue" value="Add Cluster" /> <input type="button" class="button formsubmit silver" value="Cancel" - onclick="$('#add_existing_dialog').dialog('close')" /> + onclick="$('#add_existing_dialog').dialog('close');reset_form(this.form)" /> </div> </form> </div> diff --git a/luci/templates/add_node.html b/luci/templates/add_node.html index 14f81a7..71607c1 100644 --- a/luci/templates/add_node.html +++ b/luci/templates/add_node.html @@ -51,7 +51,7 @@ <div class="row"> <input type="submit" class="button formsubmit blue" value="Add Nodes" /> <input type="button" class="button formsubmit silver" value="Cancel" - onclick="$('#add_nodes_dialog').dialog('close')" /> + onclick="$('#add_nodes_dialog').dialog('close');reset_form(this.form)" /> </div> </form> <div class="hidden"> diff --git a/luci/templates/create_cluster.html b/luci/templates/create_cluster.html index 31beb05..5a0095c 100644 --- a/luci/templates/create_cluster.html +++ b/luci/templates/create_cluster.html @@ -50,7 +50,7 @@ <div class="row"> <input type="submit" class="button formsubmit blue" value="Create Cluster" /> <input type="button" class="button formsubmit silver" value="Cancel" - onclick="$('#create_cluster_dialog').dialog('close')" /> + onclick="$('#create_cluster_dialog').dialog('close');reset_form(this.form)" /> </div> </form> <div class="hidden"> diff --git a/luci/templates/failover.html b/luci/templates/failover.html index 171ef87..b22c47d 100644 --- a/luci/templates/failover.html +++ b/luci/templates/failover.html @@ -308,7 +308,7 @@ </table> <input type="submit" class="button formsubmit blue" value="Create" /> <input type="button" class="button formsubmit silver" value="Cancel" - onclick="$('#create_fdom_dialog').dialog('close')"/> + onclick="$('#create_fdom_dialog').dialog('close');reset_form(this.form)"/> </form> </div> </div> diff --git a/luci/templates/fence.html b/luci/templates/fence.html index 82534dd..fd426ff 100644 --- a/luci/templates/fence.html +++ b/luci/templates/fence.html @@ -195,7 +195,7 @@ <input py:if="expertMode" type="hidden" name="expert_mode" value="1"/> <input type="submit" value="Submit" class="button formsubmit blue" /> <input type="button" class="button formsubmit silver" value="Cancel" - onclick="$('#create_fencedev_dialog').dialog('close')" /> + onclick="$('#create_fencedev_dialog').dialog('close');reset_form(this.form)" /> </div> </form> </div> diff --git a/luci/templates/node.html b/luci/templates/node.html index 7e0edc0..e1097c1 100644 --- a/luci/templates/node.html +++ b/luci/templates/node.html @@ -403,7 +403,7 @@ <div class="row"> <input type="submit" value="Submit" class="button formsubmit blue" /> <input type="button" class="button formsubmit silver" value="Cancel" - onclick="$('#edit_fencedev_dialog_${instance_id}').dialog('close')" /> + onclick="$('#edit_fencedev_dialog_${instance_id}').dialog('close');reset_form(this.form)" /> </div> </form> </div> @@ -505,7 +505,7 @@ <div class="row"> <input type="submit" value="Submit" class="button formsubmit blue" /> <input type="button" class="button formsubmit silver" value="Cancel" - onclick="$('#create_fencedev_dialog').dialog('close')" /> + onclick="$('#create_fencedev_dialog').dialog('close');reset_form(this.form)" /> </div> </form> </div> @@ -518,7 +518,7 @@ <div class="row"> <input type="submit" value="Submit" class="button formsubmit blue" /> <input type="button" class="button formsubmit silver" value="Cancel" - onclick="$('#create_fencemethod_dialog').dialog('close')" /> + onclick="$('#create_fencemethod_dialog').dialog('close');reset_form(this.form)" /> </div> </form> </div> diff --git a/luci/templates/resource.html b/luci/templates/resource.html index 8b30666..5c07db5 100644 --- a/luci/templates/resource.html +++ b/luci/templates/resource.html @@ -132,7 +132,7 @@ <input py:if="expertMode" type="hidden" name="expert_mode" value="1"/> <input type="submit" class="formsubmit button blue" value="Submit"/> <input type="button" class="formsubmit button silver" value="Cancel" - onclick="$('#add_resource_dialog').dialog('close')" /> + onclick="$('#add_resource_dialog').dialog('close');reset_form(this.form)" /> </div> </form> </div> diff --git a/luci/templates/service.html b/luci/templates/service.html index 68aeabe..bd14eb0 100644 --- a/luci/templates/service.html +++ b/luci/templates/service.html @@ -276,7 +276,7 @@ <input type="button" class="formsubmit button blue" value="Submit" onclick="submit_svc_form(this.form)"/> <input type="button" class="formsubmit button silver" value="Cancel" - onclick="$('#add_service_dialog').dialog('close')" /> + onclick="$('#add_service_dialog').dialog('close');reset_form(this.form)" /> </div> <input type="hidden" name="action" value="create"/> <input type="hidden" name="res_count" value="0"/>
luci-commits@lists.fedorahosted.org