Changeset 795

Timestamp:

02/25/10 01:32:40 (6 months ago)

Author:

alex94040

Message:

Fixes #454 (Remove / replace QCodo listbox.js). Code by alex94040, review/little tweaks by alex94040.

Location:

framework/branches/2.0

Files:

• assets/_core/js/listbox.js (deleted)
• includes/qcubed/_core/base_controls/QListBoxBase.class.php (modified) (1 diff)
• includes/qcubed/controls/QListBox.class.php (modified) (1 diff)

framework/branches/2.0/includes/qcubed/_core/base_controls/QListBoxBase.class.php

@@ -33 +33 @@
                 protected $strSelectionMode = QSelectionMode::Single;
 
-                // SETTINGS
-                protected $strJavaScripts = 'listbox.js';
-
                 //////////
                 // Methods

framework/branches/2.0/includes/qcubed/controls/QListBox.class.php

@@ -29 +29 @@
                  */
                 protected function GetResetButtonHtml() {
-                        $strToReturn = sprintf(' <a href="#" onclick="__resetListBox(%s, %s); return false;" class="listboxReset">%s</a>',
-                                "'" . $this->Form->FormId . "'",
-                                "'" . $this->strControlId . "'",
-                                QApplication::Translate('Reset'));
+                        $strJavaScriptOnClick = sprintf('$j("#%s").val(null);$j("#%s").trigger("change"); return false;', $this->strControlId,$this->strControlId);
+                        
+                        $strToReturn = sprintf(' <a id="reset_ctl_%s" href="#" class="listboxReset">%s</a>',
+                                $this->strControlId,
+                                QApplication::Translate('Reset')
+                        );
 
+                        QApplication::ExecuteJavaScript(sprintf('$j("#reset_ctl_%s").bind("%s", function(){ %s });', $this->strControlId, "click",  $strJavaScriptOnClick));
+                                        
                         return $strToReturn;
                 }