diff options
| author | wei <> | 2006-07-14 05:27:35 +0000 |
|---|---|---|
| committer | wei <> | 2006-07-14 05:27:35 +0000 |
| commit | 26c3775697fc94086269d54099576679137e5eda (patch) | |
| tree | 349d684c5b1a4db7e09e79f3376cad7ef391a0ee /framework/Web/UI | |
| parent | 873b2586d6d4ccb8416cd5aac132d992656c1ef5 (diff) | |
Fixed #284
Diffstat (limited to 'framework/Web/UI')
| -rw-r--r-- | framework/Web/UI/WebControls/TCustomValidator.php | 10 | ||||
| -rw-r--r-- | framework/Web/UI/WebControls/TTextHighlighter.php | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/framework/Web/UI/WebControls/TCustomValidator.php b/framework/Web/UI/WebControls/TCustomValidator.php index 32510f89..2afa48dc 100644 --- a/framework/Web/UI/WebControls/TCustomValidator.php +++ b/framework/Web/UI/WebControls/TCustomValidator.php @@ -120,6 +120,16 @@ class TCustomValidator extends TBaseValidator $options['ClientValidationFunction']=$clientJs;
return $options;
}
+
+ /**
+ * Only register the client-side validator if
+ * {@link setClientValidationFunction ClientValidationFunction} is set.
+ */
+ protected function registerClientScriptValidator()
+ {
+ if($this->getClientValidationFunction()!=='')
+ parent::registerClientScriptValidator();
+ }
}
/**
diff --git a/framework/Web/UI/WebControls/TTextHighlighter.php b/framework/Web/UI/WebControls/TTextHighlighter.php index a9ccf5bb..f4e72895 100644 --- a/framework/Web/UI/WebControls/TTextHighlighter.php +++ b/framework/Web/UI/WebControls/TTextHighlighter.php @@ -136,7 +136,7 @@ class TTextHighlighter extends TTextProcessor $geshi->enable_classes();
if($this->getEnableCopyCode())
$geshi->set_header_content($this->getHeaderTemplate());
-
+
return $geshi->parse_code();
}
|