Changeset 593
- Timestamp:
- 01/31/06 12:50:22 (3 years ago)
- Files:
-
- mochikit/branches/scriptaculous/MochiKit/Controls.js (modified) (2 diffs)
- mochikit/branches/scriptaculous/MochiKit/New.js (modified) (6 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
mochikit/branches/scriptaculous/MochiKit/Controls.js
r577 r593 37 37 38 38 ***/ 39 40 MochiKit.Base.update(MochiKit.Base, { 41 ScriptFragment: '(?:<script.*?>)((\n|\r|.)*?)(?:<\/script>)', 42 43 stripScripts: function (str) { 44 return str.replace(new RegExp(MochiKit.Base.ScriptFragment, 'img'), ''); 45 }, 46 47 extractScripts: function (str) { 48 var matchAll = new RegExp(MochiKit.Base.ScriptFragment, 'img'); 49 var matchOne = new RegExp(MochiKit.Base.ScriptFragment, 'im'); 50 return MochiKit.Base.map(function (scriptTag) { 51 return (scriptTag.match(matchOne) || ['', ''])[1]; 52 }, str.match(matchAll) || []); 53 }, 54 55 evalScripts: function (str) { 56 return MochiKit.Base.map(function (scr) { 57 eval(scr); 58 }, MochiKit.Base.extractScripts(str)); 59 } 60 }); 39 61 40 62 MochiKit.Form = { … … 386 408 MochiKit.DOM.getElement(receiver).innerHTML = 387 409 MochiKit.Base.stripScripts(response); 388 setTimeout(function () {410 setTimeout(function () { 389 411 MochiKit.Base.evalScripts(response); 390 412 }, 10); mochikit/branches/scriptaculous/MochiKit/New.js
r577 r593 1 1 2 2 MochiKit.Base.update(MochiKit.Base, { 3 ScriptFragment: '(?:<script.*?>)((\n|\r|.)*?)(?:<\/script>)',4 5 3 emptyFunction: function () {}, 6 4 … … 22 20 }, 23 21 24 stripScripts: function (str) {25 return str.replace(new RegExp(MochiKit.Base.ScriptFragment, 'img'), '');26 },27 28 extractScripts: function (str) {29 var matchAll = new RegExp(MochiKit.Base.ScriptFragment, 'img');30 var matchOne = new RegExp(MochiKit.Base.ScriptFragment, 'im');31 return MochiKit.Iter.imap(function (scriptTag) {32 return (scriptTag.match(matchOne) || ['', ''])[1];33 }, str.match(matchAll) || []);34 },35 36 evalScripts: function (str) {37 return MochiKit.Iter.list(MochiKit.Iter.imap(function (scr) {38 eval(scr);39 }, MochiKit.Base.extractScripts(str)));40 },41 42 22 flatten: function (array) { 43 23 return MochiKit.Base.map(function (item) { … … 128 108 129 109 setOpacity: function (element, value) { 130 element = MochiKit.DOM.getElement(element);110 element = MochiKit.DOM.getElement(element); 131 111 if (value == 1) { 132 112 MochiKit.DOM.setStyle(element, {opacity: … … 176 156 element = MochiKit.DOM.getElement(element); 177 157 var pos = MochiKit.DOM.getStyle(element, 'position'); 178 if ( pos == 'static' || !pos) {158 if ((pos == 'static' || !pos) && !element._madePositioned) { 179 159 element._madePositioned = true; 180 160 element.style.position = 'relative'; … … 194 174 element._madePositioned = undefined; 195 175 element.style.position = element.style.top = element.style.left = element.style.bottom = element.style.right = ''; 196 }197 },198 199 setContentZoom: function (element, percent) {200 MochiKit.DOM.setStyle(element, {fontSize: (percent/100) + 'em'});201 if (MochiKit.Base.isSafari()) {202 window.scrollBy(0, 0);203 176 } 204 177 } … … 232 205 }, 233 206 234 realOffset: function (element) {207 realOffset: function (element) { 235 208 var valueT = 0, valueL = 0; 236 209 do {
