diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2006-01-06 10:06:20 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2006-01-06 10:06:20 +0000 |
| commit | 12a70ca4a30a719ec19f9cd4fe6b9095ec9fe8a5 (patch) | |
| tree | 7a0f94770be334ac3b8486a2ca43a9ef58a649d1 /wp-inst/wp-admin/inline-uploading.php | |
| parent | b57ac48281c44847de6f128c109c5d13bd46d1cc (diff) | |
| download | wordpress-mu-12a70ca4a30a719ec19f9cd4fe6b9095ec9fe8a5.tar.gz wordpress-mu-12a70ca4a30a719ec19f9cd4fe6b9095ec9fe8a5.tar.xz wordpress-mu-12a70ca4a30a719ec19f9cd4fe6b9095ec9fe8a5.zip | |
WP Merge
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@493 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-inst/wp-admin/inline-uploading.php')
| -rw-r--r-- | wp-inst/wp-admin/inline-uploading.php | 34 |
1 files changed, 20 insertions, 14 deletions
diff --git a/wp-inst/wp-admin/inline-uploading.php b/wp-inst/wp-admin/inline-uploading.php index e3ff445..6a91dca 100644 --- a/wp-inst/wp-admin/inline-uploading.php +++ b/wp-inst/wp-admin/inline-uploading.php @@ -337,24 +337,15 @@ function selectLink(n) { }
}
function toggleLink(n) {
- od=document.getElementById('div'+n);
ol=document.getElementById('L'+n);
- oi=document.getElementById('I'+n);
- if ( oi.innerHTML == usingthumbnail ) {
- img = imga[n];
- } else {
- img = imgb[n];
- }
if ( ol.innerHTML == htmldecode(notlinked) ) {
- od.innerHTML = ab[n]+img+'</a>';
ol.innerHTML = linkedtoimage;
} else if ( ol.innerHTML == htmldecode(linkedtoimage) ) {
- od.innerHTML = aa[n]+img+'</a>';
ol.innerHTML = linkedtopage;
} else {
- od.innerHTML = img;
ol.innerHTML = notlinked;
}
+ updateImage(n);
}
function toggleOtherLink(n) {
od=document.getElementById('div'+n);
@@ -372,15 +363,13 @@ function toggleOtherLink(n) { oi.innerHTML = ih;
}
function toggleImage(n) {
- o = document.getElementById('image'+n);
oi = document.getElementById('I'+n);
if ( oi.innerHTML == htmldecode(usingthumbnail) ) {
- o.src = srcb[n];
oi.innerHTML = usingoriginal;
} else {
- o.src = srca[n];
oi.innerHTML = usingthumbnail;
}
+ updateImage(n);
}
function toggleOtherIcon(n) {
od = document.getElementById('div'+n);
@@ -401,7 +390,23 @@ function toggleOtherIcon(n) { else
od.className = 'otherwrap usingtext';
}
-
+function updateImage(n) {
+ od=document.getElementById('div'+n);
+ ol=document.getElementById('L'+n);
+ oi=document.getElementById('I'+n);
+ if ( oi.innerHTML == htmldecode(usingthumbnail) ) {
+ img = imga[n];
+ } else {
+ img = imgb[n];
+ }
+ if ( ol.innerHTML == htmldecode(linkedtoimage) ) {
+ od.innerHTML = ab[n]+img+'</a>';
+ } else if ( ol.innerHTML == htmldecode(linkedtopage) ) {
+ od.innerHTML = aa[n]+img+'</a>';
+ } else {
+ od.innerHTML = img;
+ }
+}
var win = window.opener ? window.opener : window.dialogArguments;
if (!win) win = top;
tinyMCE = win.tinyMCE;
@@ -410,6 +415,7 @@ function sendToEditor(n) { o = document.getElementById('div'+n);
h = o.innerHTML.replace(new RegExp('^\\s*(.*?)\\s*$', ''), '$1'); // Trim
h = h.replace(new RegExp(' (class|title|width|height|id|onclick|onmousedown)=([^\'"][^ ]*)( |/|>)', 'g'), ' $1="$2"$3'); // Enclose attribs in quotes
+ h = h.replace(new RegExp(' (width|height)=".*?"', 'g'), ''); // Drop size constraints
h = h.replace(new RegExp(' on(click|mousedown)="[^"]*"', 'g'), ''); // Drop menu events
h = h.replace(new RegExp('<(/?)A', 'g'), '<$1a'); // Lowercase tagnames
h = h.replace(new RegExp('<IMG', 'g'), '<img'); // Lowercase again
|