From 80f6224d38b8848c9d8ef1d607f1a130a5724801 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Sat, 10 Nov 2007 05:15:28 +0000 Subject: [PATCH] #1658 Create a new language, then refresh the CMS gives toggle() error in js (sits on loading page) git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44566 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- images/toggle-closed.gif | Bin 585 -> 588 bytes images/toggle-open.gif | Bin 588 -> 585 bytes javascript/ToggleField.js | 13 ++++++++----- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/images/toggle-closed.gif b/images/toggle-closed.gif index 805e57d1d322385c251e9e43ecdacfdfa2bcfc39..07daef067cd7fa901812647060e6d97666e4bb20 100644 GIT binary patch delta 407 zcmV;I0cifo1k40~M@dFFIbjL_5&-4^0RR90eSU~fP+VMGW_*2xe0_#|eTPs{U3+|l zeSL>tUujraW3sZgd3l0*dxT?SY_+wyPET8We1=(BWL{oqU0rCTq^VI-UTA1>cXxnh zXK;Rghi7PUdwhklv9^7FhJ1X7zP`d%R$)$0TvJqFQ&eACT3Tg!d4X71Vr6D;WMpo= zy}`V^!F+s#QBqxCU}|YV87C|NKtKR2CmAysI1m5;5I7h! zDHG5|R$LJtf878U>u4?_wsJ|4jyJ}(Lb6%+~~Aqo@~0~01T z1N#FuEhZBpbf8#3Z~+P(B1(|xv7<(f9X&{tIB>wlg%~j|xS$wegn*AAM??q&06W`a Bj{E=s delta 398 zcmV;90dfA!1jz({M@dFFIbjL_5&-4^0RR90eSU~ePFjC}ihF#9QBqxge~L{_S$utn zTU%v%dxLy^hI@R4V`FVkP+U}1V6LvSd3u6;eTQ9LXnK2u!NJ8RY7@D7uW0TX|wfCdHwgoT0uhyf}pi2)}P2ndLg5+@}D z1PhuAm?at%Hw>Z-HxwEk5ef=5HL4LF7cMp}001pEE*B;#8vs2$02?VL96RY7@D7uW0TX|wfCdHwgoT0uhyf}pi2)}P2ndLg5+@}D z1PhuAm?at%Hw>Z-HxwEk5ef=5HL4LF7cMp}001pEE*B;#8vs2$02?VL96tUujraW3sZgd3l0*dxT?SY_+wyPET8We1=(BWL{oqU0rCTq^VI-UTA1>cXxnh zXK;Rghi7PUdwhklv9^7FhJ1X7zP`d%R$)$0TvJqFQ&eACT3Tg!d4X71Vr6D;WMpo= zy}`V^!F+s#QBqxCU}|YV87C|NKtKR2CmAysI1m5;5I7h! zDHG5|R$LJtf878U>u4?_wsJ|4jyJ}(Lb6%+~~Aqo@~0~01T z1N#FuEhZBpbf8#3Z~+P(B1(|xv7<(f9X&{tIB>wlg%~j|xS$wegn*AAM??q&06W`a Bj{E=s diff --git a/javascript/ToggleField.js b/javascript/ToggleField.js index de660b232..e41a38255 100644 --- a/javascript/ToggleField.js +++ b/javascript/ToggleField.js @@ -4,26 +4,29 @@ ToggleField.prototype = { var rules = {}; rules['#' + this.id + ' .triggerMore'] = { onclick: function(e) { - this.toggle(); + Element.toggle(this); Event.stop(e); return false; }.bind(this) }; rules['#' + this.id + ' .triggerLess'] = { onclick: function(e) { - this.toggle(); + Element.toggle(this); Event.stop(e); return false; }.bind(this) }; Behaviour.register(rules); if(Element.hasClassName(this, 'startClosed')) { - this.toggle(); + Element.toggle(this); } }, toggle: function() { - Element.toggle($$('#' + this.id + ' .contentLess')[0]); - Element.toggle($$('#' + this.id + ' .contentMore')[0]); + var lessDivs = $$('#' + this.id + ' .contentLess'); + if(lessDivs) Element.toggle(lessDivs[0]); + + var moreDivs = $$('#' + this.id + ' .contentMore'); + if(moreDivs) Element.toggle(moreDivs[0]); } } ToggleField.applyTo('div.toggleField'); \ No newline at end of file