Merge branch 'skinnable-master'

[nucleus-jp/nucleus-next.git] / skins / admin / bookmarklet / javascripts / edit.js

diff --git a/skins/admin/bookmarklet/javascripts/edit.js b/skins/admin/bookmarklet/javascripts/edit.js
index 0faa6da..266790f 100644 (file)
--- a/skins/admin/bookmarklet/javascripts/edit.js
+++ b/skins/admin/bookmarklet/javascripts/edit.js
@@ -137,16 +137,14 @@ var nonie_FormType = 'body';
 
 // Add media to new item
 function addMedia() {
-
-       var mediapopup = window.open(nucleusMediaPopupURL + 'media.php','name',
-               'status=yes,toolbar=no,scrollbars=yes,resizable=yes,width=500,height=450,top=0,left=0');
-
-       return;
-}
-
-
-function setMediaPopupURL(url) {
-       nucleusMediaPopupURL = url;
+       if ( typeof(medium) != 'undefined' )
+       {
+               medium.addMedia();
+       }
+       else
+       {
+               alert('Media Plugin Not Found');
+       }
 }
 
 function includeImage(collection, filename, type, width, height) {
@@ -338,7 +336,6 @@ function BtnHighlight(el) {
 
 function BtnNormal(el) {
        with(el.style){
-               padding="3px";
                border="1px solid #dddddd";
        }
 }