Changeset 1796

Timestamp:

20.01.2012 22:21:22 (4 months ago)

Author:

zmsdev

Message:

Ticket#19 (uni-bern): CKEditor - crop relative urls (2)

Location:

ZMS/trunk

Files:

• _objattrs.py (modified) (1 diff)
• _zreferableitem.py (modified) (1 diff)
• plugins/rte/ckeditor/manage_form.dtml (modified) (1 diff)
• plugins/www/jquery/jquery-all.min.js (modified) (1 diff)
• plugins/www/jquery/plugin/jquery.plugin.zmi.js (modified) (1 diff)

ZMS/trunk/_objattrs.py

@@ -1125 +1125 @@
           if href.rfind( '#') > 0:
             if href.rfind( '/') > 0:
-              href = href[ :href.rfind( '/')] + '/' + href[ href.rfind( '#') + 1:]
+              if href[href.rfind( '/'):].find('.') > 0:
+                href = href[ :href.rfind( '/')] + '/' + href[ href.rfind( '#') + 1:]
             else:
               href = href[ href.rfind( '#') + 1:]
           else:
             if href.rfind( '/') > 0:
-              href = href[ :href.rfind( '/')]
+              if href[href.rfind( '/'):].find('.') > 0:
+                href = href[ :href.rfind( '/')]
             else:
               href = ''
-          ref_obj = self.getSelf( self.PAGES)
+          ref_obj = self.getVersionContainer()
           for el in href.split( '/'):
             if ref_obj is not None:

ZMS/trunk/_zreferableitem.py

@@ -124 +124 @@
   def getRelObjPath(self, ob):
     ref = '.'
-    currntElmnts = self.getSelf( self.PAGES).getPhysicalPath()
+    currntElmnts = self.getVersionContainer().getPhysicalPath()
     targetElmnts = ob.getSelf( ).getPhysicalPath()
     i = 0

ZMS/trunk/plugins/rte/ckeditor/manage_form.dtml

@@ -55 +55 @@
                                 var data = CKEDITOR.instances['editor_'+elName].getData();
                                 // Relativate urls.
-                                data = zmiRelativateUrls(data);
+                                data = zmiRelativateUrls(data,'<dtml-var "getVersionContainer().absolute_url()">');
                                 // Assign value to textarea.
                                 $('#'+elName).val( data);

ZMS/trunk/plugins/www/jquery/jquery-all.min.js

@@ -108 +108 @@
 targetPath='../'+targetPath}
 url='./'+targetPath;return url}
-function zmiRelativateUrls(s){var url0=self.location.href;url0=url0.substr(0,url0.lastIndexOf("/"));var splitTags=['<a href="','<img src="'];for(var j=0;j < splitTags.length;j++){var vSplit=s.split(splitTags[j]);var v=vSplit[0];for(var i=1;i < vSplit.length;i++){var j=vSplit[i].indexOf("\"");var url=vSplit[i].substring(0,j);if(url.indexOf('./')<0){url=zmiRelativateUrl(url0,url)}
+function zmiRelativateUrls(s,page_url){var splitTags=['<a href="','<img src="'];for(var h=0;h < splitTags.length;h++){var splitTag=splitTags[h];var vSplit=s.split(splitTag);var v=vSplit[0];for(var i=1;i < vSplit.length;i++){var j=vSplit[i].indexOf('"');var url=vSplit[i].substring(0,j);if(url.indexOf('./')<0){url=zmiRelativateUrl(page_url,url)}
 v+=splitTag+url+vSplit[i].substring(j)}
 s=v}

ZMS/trunk/plugins/www/jquery/plugin/jquery.plugin.zmi.js

@@ -215 +215 @@
 }
 
-function zmiRelativateUrls(s) {
-        var url0 = self.location.href;
-        url0 = url0.substr(0,url0.lastIndexOf("/"));
+function zmiRelativateUrls(s,page_url) {
         var splitTags = ['<a href="','<img src="'];
-        for ( var j = 0; j < splitTags.length; j++) {
-                var vSplit = s.split(splitTags[j]);
+        for ( var h = 0; h < splitTags.length; h++) {
+        var splitTag = splitTags[h];
+                var vSplit = s.split(splitTag);
                 var v = vSplit[0];
                 for ( var i = 1; i < vSplit.length; i++) {
-                        var j = vSplit[i].indexOf("\"");
+                        var j = vSplit[i].indexOf('"');
                         var url = vSplit[i].substring(0,j);
                         if (url.indexOf('./')<0) {
-                                url = zmiRelativateUrl(url0,url);
+                                url = zmiRelativateUrl(page_url,url);
                         }
                         v += splitTag + url + vSplit[i].substring(j);