Author: jablko
Date: Thu Oct 21 23:21:59 2010
New Revision: 8376
Log:
Call handleFieldRender in context of QubitDialog, vs. options
Modified:
trunk/apps/qubit/modules/informationobject/templates/_event.php
trunk/js/dialog.js
trunk/plugins/sfClassicPlugin/css/main.css
trunk/plugins/sfIsaarPlugin/modules/sfIsaarPlugin/templates/_event.php
trunk/plugins/sfIsaarPlugin/modules/sfIsaarPlugin/templates/_relatedAuthorityRecord.php
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/templates/_relatedFunction.php
Modified: trunk/apps/qubit/modules/informationobject/templates/_event.php
==============================================================================
--- trunk/apps/qubit/modules/informationobject/templates/_event.php Thu Oct
21 22:51:41 2010 (r8375)
+++ trunk/apps/qubit/modules/informationobject/templates/_event.php Thu Oct
21 23:21:59 2010 (r8376)
@@ -54,32 +54,32 @@
attach: function (context)
{
// Add special rendering rules
- var handleFieldRender = function (obj, fname)
+ var handleFieldRender = function (fname)
{
var matches = fname.match(/(\w+)\[(\w+)\]/);
if (null == matches)
{
- return obj.renderField(fname);
+ return this.renderField(fname);
}
switch (matches[2])
{
case 'dateDisplay':
- if (0 < obj.getField('dateDisplay').value.length)
+ if (0 < this.getField('dateDisplay').value.length)
{
- return obj.getField('dateDisplay').value;
+ return this.getField('dateDisplay').value;
}
- else if (0 < obj.getField('startDate').value.length && 0 <
obj.getField('endDate').value.length)
+ else if (0 < this.getField('startDate').value.length && 0 <
this.getField('endDate').value.length)
{
- return obj.getField('startDate').value + ' - ' +
obj.getField('endDate').value;
+ return this.getField('startDate').value + ' - ' +
this.getField('endDate').value;
}
- return obj.getField('startDate').value;
+ return this.getField('startDate').value;
default:
- return obj.renderField(fname);
+ return this.renderField(fname);
}
}
Modified: trunk/js/dialog.js
==============================================================================
--- trunk/js/dialog.js Thu Oct 21 22:51:41 2010 (r8375)
+++ trunk/js/dialog.js Thu Oct 21 23:21:59 2010 (r8376)
@@ -59,15 +59,6 @@
}
});
- // Create YUI container for dialog
- var $yuiDialogWrapper = $('<div id="' + this.table.id + '">'
- + ' <div class="hd">'
- + ' ' + this.label
- + ' </div><div class="bd">'
- + ' <form/>'
- + ' </div>'
- + '</div>').appendTo('body');
-
// Bind click event to "Add" link
$('<a href="#">Add new</a>')
.click(function (event)
@@ -79,6 +70,15 @@
})
.insertAfter(this.table);
+ // Create YUI container for dialog
+ var $yuiDialogWrapper = $('<div id="' + this.table.id + '">'
+ + ' <div class="hd">'
+ + ' ' + this.label
+ + ' </div><div class="bd">'
+ + ' <form/>'
+ + ' </div>'
+ + '</div>').appendTo('body');
+
// Replace dialog table with "Add" link and move into dialog wrapper
$(this.table).appendTo($yuiDialogWrapper.find('form'));
@@ -462,10 +462,7 @@
// Check for special field render handler
if (undefined !== this.options.handleFieldRender)
{
- var render = function (fname)
- {
- return thisDialog.options.handleFieldRender(thisDialog,
fname);
- }
+ var render = thisDialog.options.handleFieldRender;
}
else
{
@@ -480,7 +477,7 @@
{
if (0 < fname.length)
{
- tr = tr.replace('{' + fname + '}', render(fname));
+ tr = tr.replace('{' + fname + '}', render.call(this, fname));
}
}
Modified: trunk/plugins/sfClassicPlugin/css/main.css
==============================================================================
--- trunk/plugins/sfClassicPlugin/css/main.css Thu Oct 21 22:51:41 2010
(r8375)
+++ trunk/plugins/sfClassicPlugin/css/main.css Thu Oct 21 23:21:59 2010
(r8376)
@@ -448,6 +448,9 @@
-moz-transition: opacity .5s;
-o-transition: opacity .5s;
-webkit-transition: opacity .5s;
+
+ width: 480px;
+ z-index: 100;
}
.yui-overlay-hidden
Modified: trunk/plugins/sfIsaarPlugin/modules/sfIsaarPlugin/templates/_event.php
==============================================================================
--- trunk/plugins/sfIsaarPlugin/modules/sfIsaarPlugin/templates/_event.php
Thu Oct 21 22:51:41 2010 (r8375)
+++ trunk/plugins/sfIsaarPlugin/modules/sfIsaarPlugin/templates/_event.php
Thu Oct 21 23:21:59 2010 (r8376)
@@ -76,32 +76,32 @@
attach: function (context)
{
// Add special rendering rules
- var handleFieldRender = function (obj, fname)
+ var handleFieldRender = function (fname)
{
var matches = fname.match(/(\w+)\[(\w+)\]/);
if (null == matches)
{
- return obj.renderField(fname);
+ return this.renderField(fname);
}
switch (matches[2])
{
case 'dateDisplay':
- if (0 < obj.getField('dateDisplay').value.length)
+ if (0 < this.getField('dateDisplay').value.length)
{
- return obj.getField('dateDisplay').value;
+ return this.getField('dateDisplay').value;
}
- else if (0 < obj.getField('startDate').value.length && 0 <
obj.getField('endDate').value.length)
+ else if (0 < this.getField('startDate').value.length && 0 <
this.getField('endDate').value.length)
{
- return obj.getField('startDate').value + ' - ' +
obj.getField('endDate').value;
+ return this.getField('startDate').value + ' - ' +
this.getField('endDate').value;
}
- return obj.getField('startDate').value;
+ return this.getField('startDate').value;
default:
- return obj.renderField(fname);
+ return this.renderField(fname);
}
}
Modified:
trunk/plugins/sfIsaarPlugin/modules/sfIsaarPlugin/templates/_relatedAuthorityRecord.php
==============================================================================
---
trunk/plugins/sfIsaarPlugin/modules/sfIsaarPlugin/templates/_relatedAuthorityRecord.php
Thu Oct 21 22:51:41 2010 (r8375)
+++
trunk/plugins/sfIsaarPlugin/modules/sfIsaarPlugin/templates/_relatedAuthorityRecord.php
Thu Oct 21 23:21:59 2010 (r8376)
@@ -86,32 +86,32 @@
attach: function (context)
{
// Add special rendering rules
- var handleFieldRender = function (obj, fname)
+ var handleFieldRender = function (fname)
{
var matches = fname.match(/(\w+)\[(\w+)\]/);
if (null == matches)
{
- return obj.renderField(fname);
+ return this.renderField(fname);
}
switch (matches[2])
{
case 'dateDisplay':
- if (0 < obj.getField('dateDisplay').value.length)
+ if (0 < this.getField('dateDisplay').value.length)
{
- return obj.getField('dateDisplay').value;
+ return this.getField('dateDisplay').value;
}
- else if (0 < obj.getField('startDate').value.length && 0 <
obj.getField('endDate').value.length)
+ else if (0 < this.getField('startDate').value.length && 0 <
this.getField('endDate').value.length)
{
- return obj.getField('startDate').value + ' - ' +
obj.getField('endDate').value;
+ return this.getField('startDate').value + ' - ' +
this.getField('endDate').value;
}
- return obj.getField('startDate').value;
+ return this.getField('startDate').value;
default:
- return obj.renderField(fname);
+ return this.renderField(fname);
}
}
Modified:
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/templates/_relatedFunction.php
==============================================================================
---
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/templates/_relatedFunction.php
Thu Oct 21 22:51:41 2010 (r8375)
+++
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/templates/_relatedFunction.php
Thu Oct 21 23:21:59 2010 (r8376)
@@ -82,33 +82,34 @@
$url = url_for(array($resource, 'module' => 'function'));
echo javascript_tag(<<<content
+
// Add special rendering rules
-var handleFieldRender = function (obj, fname)
+var handleFieldRender = function (fname)
{
var matches = fname.match(/(\w+)\[(\w+)\]/);
if (null == matches)
{
- return obj.renderField(fname);
+ return this.renderField(fname);
}
switch (matches[2])
{
case 'dateDisplay':
- if (0 < obj.getField('dateDisplay').value.length)
+ if (0 < this.getField('dateDisplay').value.length)
{
- return obj.getField('dateDisplay').value;
+ return this.getField('dateDisplay').value;
}
- else if (0 < obj.getField('startDate').value.length && 0 <
obj.getField('endDate').value.length)
+ else if (0 < this.getField('startDate').value.length && 0 <
this.getField('endDate').value.length)
{
- return obj.getField('startDate').value + ' - ' +
obj.getField('endDate').value;
+ return thisetField('startDate').value + ' - ' +
this.getField('endDate').value;
}
- return obj.getField('startDate').value;
+ return this.getField('startDate').value;
default:
- return obj.renderField(fname);
+ return this.renderField(fname);
}
}
--
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.
