Commit 364c79c6c092b02ffc72911124681777b9288b62
1 parent
00c2b469
moved browser check to $defaults
git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@2278 c91229c3-7414-0410-bfa2-8a42b809f60b
Showing
1 changed file
with
4 additions
and
5 deletions
lib/visualpatterns/PatternMainPage.inc
| ... | ... | @@ -128,7 +128,6 @@ class PatternMainPage { |
| 128 | 128 | */ |
| 129 | 129 | function render() { |
| 130 | 130 | global $default; |
| 131 | - $bNN4 = (($default->browser == "moz") && ($default->version <= "4.79") || ($default->browser == "ns")); | |
| 132 | 131 | $sToRender = "<html>\n"; |
| 133 | 132 | $sToRender .= "<head>\n"; |
| 134 | 133 | $sToRender .= "<title>The KnowledgeTree</title>"; |
| ... | ... | @@ -139,7 +138,7 @@ class PatternMainPage { |
| 139 | 138 | "</head>\n" . |
| 140 | 139 | "<body marginleft=\"0\" marginheight=\"0\" " . (isset($this->onLoadJavaScript) ? "onload=\"$this->onLoadJavaScript\"" : "") . ">\n"; |
| 141 | 140 | // hack to circumvent the crapness of ns 4.79 |
| 142 | - if (!$bNN4 ) { | |
| 141 | + if (!$default->bNN4 && $this->bScroll) { | |
| 143 | 142 | $sToRender .= "<div id=\"divUp\">" . |
| 144 | 143 | "\t<a href=\"#\" onmouseover=\"scroll(-7)\" onmouseout=\"noScroll()\"><img src=\"" . $default->graphicsUrl . "/down.gif\" width=\"18\" height=\"9\" alt=\"up\" border=\"0\"></a>" . |
| 145 | 144 | "</div>" . |
| ... | ... | @@ -178,7 +177,7 @@ class PatternMainPage { |
| 178 | 177 | |
| 179 | 178 | if (isset($this->oCentralPayload)) { |
| 180 | 179 | // hack to circumvent the crapness of ns 4.79 |
| 181 | - if (!$bNN4 && $this->bScroll) { | |
| 180 | + if (!$default->bNN4 && $this->bScroll) { | |
| 182 | 181 | $sToRender .= "\t<div id=\"divScrollTextCont\">\n |
| 183 | 182 | \t\t<div id=\"divText\">\n"; |
| 184 | 183 | } |
| ... | ... | @@ -190,7 +189,7 @@ class PatternMainPage { |
| 190 | 189 | $sToRender = $sToRender . "\nCentral payload not set\n"; |
| 191 | 190 | } |
| 192 | 191 | // hack to circumvent the crapness of ns 4.79 |
| 193 | - if (! $bNN4 ) { | |
| 192 | + if (!$default->bNN4 && $this->bScroll) { | |
| 194 | 193 | $sToRender = $sToRender . "</div></div>\n"; |
| 195 | 194 | } |
| 196 | 195 | $sToRender = $sToRender . "</td>\n" . |
| ... | ... | @@ -214,7 +213,7 @@ class PatternMainPage { |
| 214 | 213 | $sUrl = $default->uiUrl; |
| 215 | 214 | // hack to circumvent the crapness of ns 4.79 |
| 216 | 215 | |
| 217 | - if (!$bNN4 && $this->bScroll) { | |
| 216 | + if (!$default->bNN4 && $this->bScroll) { | |
| 218 | 217 | $sJavaScript = "<script type=\"text/javascript\" src=\"$sUrl/js/scroll.js\"></script>\n"; |
| 219 | 218 | } |
| 220 | 219 | $sJavaScript .= "<script type=\"text/javascript\" src=\"$sUrl/js/datePicker.js\"></script>\n"; | ... | ... |