Author: jablko
Date: Mon Oct 18 10:38:41 2010
New Revision: 8229
Log:
Indentation
Modified:
trunk/apps/qubit/modules/relation/actions/editComponent.class.php
trunk/js/dialog.js
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/actions/editAction.class.php
Modified: trunk/apps/qubit/modules/relation/actions/editComponent.class.php
==============================================================================
--- trunk/apps/qubit/modules/relation/actions/editComponent.class.php Mon Oct
18 10:26:53 2010 (r8228)
+++ trunk/apps/qubit/modules/relation/actions/editComponent.class.php Mon Oct
18 10:38:41 2010 (r8229)
@@ -76,7 +76,7 @@
}
}
- protected function processForm()
+ public function processForm()
{
// HACK For now, parameter name and action name are the same. Should
// really be configurable, ideally by interpreting
Modified: trunk/js/dialog.js
==============================================================================
--- trunk/js/dialog.js Mon Oct 18 10:26:53 2010 (r8228)
+++ trunk/js/dialog.js Mon Oct 18 10:38:41 2010 (r8229)
@@ -92,10 +92,12 @@
// Bind onClick event to "Add" link
var addLink = $('<a href="#">Add new</a>');
- addLink.click(function ()
+ addLink.click(function (event)
{
+ // Prevent default action, "go to top of page"
+ event.preventDefault();
+
thisDialog.open();
- return false; // Prevent default action: "go to top of page"
});
// Replace dialog table with "Add" link and move into dialog wrapper
@@ -146,10 +148,7 @@
constraintoviewport: true,
postmethod: 'none',
buttons: [{ text: 'Submit', handler: handleYuiSubmit, isDefault: true },
- { text: 'Cancel', handler: handleYuiCancel }],
- effect: {
- effect: YAHOO.widget.ContainerEffect.FADE,
- duration: 0.25 } });
+ { text: 'Cancel', handler: handleYuiCancel }] });
var keyListener_Esc = new YAHOO.util.KeyListener(document, { keys: 27 }, {
fn: handleYuiCancel,
@@ -255,31 +254,31 @@
}
this.open = function ()
- {
- if (undefined == arguments[0])
- {
- // If no "id" passed as argument then create unique id and skip the data
- // load
- this.id = 'new' + this.instances++;
- }
- else
{
- this.id = arguments[0];
- }
+ if (undefined == arguments[0])
+ {
+ // If no "id" passed as argument then create unique id and skip the
data
+ // load
+ this.id = 'new' + this.instances++;
+ }
+ else
+ {
+ this.id = arguments[0];
+ }
- if (0 == arguments.length)
- {
- this.yuiDialog.show();
- this.yuiDialog.focusFirst();
- }
- else
- {
- this.loadData(this.id, function ()
- {
- thisDialog.yuiDialog.show();
- });
+ if (0 == arguments.length)
+ {
+ this.yuiDialog.show();
+ this.yuiDialog.focusFirst();
+ }
+ else
+ {
+ this.loadData(this.id, function ()
+ {
+ thisDialog.yuiDialog.show();
+ });
+ }
}
- }
this.loadData = function ()
{
@@ -574,11 +573,11 @@
thisDialog.open($(this).parents('tr').attr('id'));
});
- $('tr[id=' + this.id + '] button[name=delete]').click(function ()
+ $('tr[id=' + this.id + '] button[name=delete]').click(function (event)
{
- thisDialog.remove($(this).parents('tr').attr('id'));
+ event.preventDefault();
- return false;
+ thisDialog.remove($(this).parents('tr').attr('id'));
});
}
Modified:
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/actions/editAction.class.php
==============================================================================
---
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/actions/editAction.class.php
Mon Oct 18 10:26:53 2010 (r8228)
+++
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/actions/editAction.class.php
Mon Oct 18 10:38:41 2010 (r8229)
@@ -181,7 +181,7 @@
{
$this->relatedAuthorityRecordComponent->processForm();
$this->relatedFunctionComponent->processForm();
- $this->relatedResourceComponent()->processForm();
+ $this->relatedResourceComponent->processForm();
if (isset($this->request->deleteRelations))
{
--
You received this message because you are subscribed to the Google Groups
"Qubit Toolkit Commits" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/qubit-commits?hl=en.
