Author: david
Date: Fri Aug 17 12:11:41 2012
New Revision: 12130
Log:
Copy changes from trunk
Deleted:
branches/ica-atom/lib/task/import/csvIsaarImportTask.class.php
Modified:
branches/ica-atom/apps/qubit/config/view.yml
branches/ica-atom/js/autocomplete.js
branches/ica-atom/lib/model/QubitSetting.php
Modified: branches/ica-atom/apps/qubit/config/view.yml
==============================================================================
--- branches/ica-atom/apps/qubit/config/view.yml Fri Aug 17 10:19:59
2012 (r12129)
+++ branches/ica-atom/apps/qubit/config/view.yml Fri Aug 17 12:11:41
2012 (r12130)
@@ -27,6 +27,9 @@
javascripts:
/vendor/jquery:
+ /vendor/jquery-ui:
+ /vendor/jquery.expander.js:
+ /vendor/bootstrap:
/plugins/sfDrupalPlugin/vendor/drupal/misc/drupal:
qubit:
/vendor/yui/yahoo-dom-event/yahoo-dom-event:
Modified: branches/ica-atom/js/autocomplete.js
==============================================================================
--- branches/ica-atom/js/autocomplete.js Fri Aug 17 10:19:59 2012
(r12129)
+++ branches/ica-atom/js/autocomplete.js Fri Aug 17 12:11:41 2012
(r12130)
@@ -125,9 +125,9 @@
// items
var dataSource = new YAHOO.util.LocalDataSource();
- // See http://bugs.jquery.com/ticket/11872
- // :enabled was broken in Chrome but it works now
- $('option:enabled', this).each(function ()
+ // :enabled removed, it is broken in Chrome, see issue 2348
+ // See also http://bugs.jquery.com/ticket/11872
+ $('option', this).each(function ()
{
if ($(this).val())
{
Modified: branches/ica-atom/lib/model/QubitSetting.php
==============================================================================
--- branches/ica-atom/lib/model/QubitSetting.php Fri Aug 17 10:19:59
2012 (r12129)
+++ branches/ica-atom/lib/model/QubitSetting.php Fri Aug 17 12:11:41
2012 (r12130)
@@ -79,7 +79,7 @@
$settings[$key] = $qubitSetting->value;
}
- return $settings;
+ return $settings;
}
public function getCulture(array $options = array())
--
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.
