Index: trunk/admin/editor/cmseditor/editor/dialog/fck_link/fck_link.js =================================================================== diff -u -r2178 -r2179 --- trunk/admin/editor/cmseditor/editor/dialog/fck_link/fck_link.js (.../fck_link.js) (revision 2178) +++ trunk/admin/editor/cmseditor/editor/dialog/fck_link/fck_link.js (.../fck_link.js) (revision 2179) @@ -162,17 +162,23 @@ function CreateLinkTypes() { - if (typeof(oEditor.FCKConfig.InternalLinksEsists) != 'undefined') - { - if (oEditor.FCKConfig.InternalLinksEsists != 'Off') + if (InternalLinksEsists() === true) oEditor.FCKTools.AddSelectOption( document, GetE('cmbLinkType'), 'Internal Web Page', 'internal'); - } else - oEditor.FCKTools.AddSelectOption( document, GetE('cmbLinkType'), 'Internal Web Page', 'internal'); oEditor.FCKTools.AddSelectOption( document, GetE('cmbLinkType'), 'External Web Page', 'external'); oEditor.FCKTools.AddSelectOption( document, GetE('cmbLinkType'), 'E-mail', 'email'); oEditor.FCKTools.AddSelectOption( document, GetE('cmbLinkType'), 'File', 'Doc'); } +function InternalLinksEsists() +{ + if (typeof(oEditor.FCKConfig.InternalLinksEsists) != 'undefined') + { + if (oEditor.FCKConfig.InternalLinksEsists != 'Off') + return true; + } else + return true; +} + function LoadAnchorNamesAndIds() { //alert('LoadAnchorNamesAndIds'); @@ -222,7 +228,10 @@ var sTarget = window.parent.parentData['linkCmbTarget']; //alert('href: ' + sHRef + '\n'+'txtAlt: '+ GetE('txtAlt').value+'\n'+'sType: ' + sType+'\n'+'sTarget: ' + sTarget); } else if ( !oLink ) { - SetLinkType('internal'); + if (InternalLinksEsists() === true) + SetLinkType('internal'); + else + SetLinkType('external'); return ; } if (sHRef.length == 0) @@ -343,21 +352,20 @@ ShowE('divPopupSize',0); } else ShowE('divPopupSize',0); - if ( linkType == 'internal' ) { + + if ( linkType == 'internal' ) LoadResources(); - //LoadAnchorNamesAndIds(); - } + if ( linkType == 'email') window.parent.SetAutoSize( true ) ; } function LoadResources() { - var oXML = new FCKXml() ; - var sConnUrl = 'filemanager/browser/default/connectors/php/connector.php?Command=GetCmsTree'; - sConnUrl = window.location.href.replace( /dialog.*$/, '' ) + sConnUrl ; - oXML.LoadUrl(sConnUrl, GetCmsTreeCallBack ) ; // Asynchronous load. - + var oXML = new FCKXml() ; + var sConnUrl = 'filemanager/browser/default/connectors/php/connector.php?Command=GetCmsTree'; + sConnUrl = window.location.href.replace( /dialog.*$/, '' ) + sConnUrl ; + oXML.LoadUrl(sConnUrl, GetCmsTreeCallBack ) ; // Asynchronous load. } function GetCmsTreeCallBack( fckXml )