Changeset 1797 for ZMS/trunk

Timestamp:

23.01.2012 21:26:22 (4 months ago)

Author:

zmsdev

Message:

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

Location:

ZMS/trunk/plugins/www/jquery

Files:

• jquery-all.min.js (modified) (1 diff)
• plugin/jquery.plugin.zmi.js (modified) (1 diff)

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

@@ -91 +91 @@
 else {$content.show('normal')}
 $container.toggleClass('ui-state-active').toggleClass('ui-state-default');$icon.toggleClass('ui-icon-triangle-1-s').toggleClass('ui-icon-triangle-1-e');var zmi_form_section_id=$container.attr('id');if(typeof zmi_form_section_id !='undefined'){toggleCookie(zmi_form_section_id+'_collapsed')}
-})});function zmiRelativateUrl(path,url){var protocol=self.location.href;protocol=protocol.substr(0,protocol.indexOf(":")+3);var server_url=self.location.href;server_url=server_url.substr(protocol.length);server_url=protocol+server_url.substr(0,server_url.indexOf("/"));var currntPath=path;if(currntPath.indexOf(server_url)==0){currntPath=currntPath.substr(server_url.length+1)}
-else if(currntPath.indexOf('/')==0){currntPath=currntPath.substr(1)}
-var targetPath=url;if(targetPath.indexOf(server_url)==0){targetPath=targetPath.substr(server_url.length+1)}
-else if(targetPath.indexOf('/')==0){targetPath=targetPath.substr(1)}
+})});function zmiRelativateUrl(path,url){var protocol=self.location.href;protocol=protocol.substr(0,protocol.indexOf(":")+3);var server_url=self.location.href;server_url=server_url.substr(protocol.length);server_url=protocol+server_url.substr(0,server_url.indexOf("/"));var currntPath=null;if(path.indexOf(server_url)==0){currntPath=path.substr(server_url.length+1)}
+else if(path.indexOf('/')==0){currntPath=path.substr(1)}
+var targetPath=null;if(url.indexOf(server_url)==0){targetPath=url.substr(server_url.length+1)}
+else if(url.indexOf('/')==0){targetPath=url.substr(1)}
+if(currntPath==null||targetPath==null){return url}
 while(currntPath.length > 0&&targetPath.length > 0){var i=currntPath.indexOf('/');var j=targetPath.indexOf('/');if(i < 0){currntElmnt=currntPath}
 else {currntElmnt=currntPath.substring(0,i)}

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

@@ -154 +154 @@
         server_url = server_url.substr(protocol.length);
         server_url = protocol + server_url.substr(0,server_url.indexOf("/"));
-        var currntPath = path;
-        if (currntPath.indexOf(server_url)==0) {
-                currntPath = currntPath.substr(server_url.length+1);
-        }
-        else if (currntPath.indexOf('/')==0) {
-                currntPath = currntPath.substr(1);
-        }
-        var targetPath = url;
-        if (targetPath.indexOf(server_url)==0) {
-                targetPath = targetPath.substr(server_url.length+1);
-        }
-        else if (targetPath.indexOf('/')==0) {
-                targetPath = targetPath.substr(1);
+        var currntPath = null;
+        if (path.indexOf(server_url)==0) {
+                currntPath = path.substr(server_url.length+1);
+        }
+        else if (path.indexOf('/')==0) {
+                currntPath = path.substr(1);
+        }
+        var targetPath = null;
+        if (url.indexOf(server_url)==0) {
+                targetPath = url.substr(server_url.length+1);
+        }
+        else if (url.indexOf('/')==0) {
+                targetPath = url.substr(1);
+        }
+        if (currntPath == null || targetPath == null) {
+                return url;
         }
         while ( currntPath.length > 0 && targetPath.length > 0) {