Changeset 1803 for ZMS

Timestamp:

30.01.2012 21:58:29 (4 months ago)

Author:

zmsdev

Message:

Ticket#21 (uni-bern): jCrop-Canvas can not be moved

Location:

ZMS/trunk/plugins/www

Files:

• jquery/jquery-all.min.js (modified) (1 diff)
• jquery/plugin/jquery.plugin.extensions.js (modified) (1 diff)
• jquery/plugin/jquery.plugin.js (modified) (1 diff)
• objattrs/zmi.blob.ZMSGraphic_extEdit.js (modified) (2 diffs)

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

@@ -68 +68 @@
 function pluginJEC(s,c){$.plugin('jec',{files:['/++resource++zms_/jquery/jec/jquery.jec.min-0.5.2.js']
 });$.plugin('jec').get(s,c)}
-function runPluginJcrop(c){$.plugin('jcrop',{files:['/++resource++zms_/jquery/jcrop/jquery.Jcrop.min.js','/++resource++zms_/jquery/jcrop/jquery.Jcrop.css']
+function runPluginJcrop(c){$.plugin('jcrop',{files:['/++resource++zms_/jquery/jcrop/jquery.Jcrop.min.js?ts='+escape(new Date()),'/++resource++zms_/jquery/jcrop/jquery.Jcrop.css?ts='+escape(new Date())]
 });$.plugin('jcrop').get('body',c)}
 function runPluginCookies(c){$.plugin('cookies',{files:['/++resource++zms_/jquery/jquery.cookies.2.1.0.min.js']

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

@@ -304 +304 @@
 function runPluginJcrop(c) {
         $.plugin('jcrop',{
-                files: ['/++resource++zms_/jquery/jcrop/jquery.Jcrop.min.js',
-                                '/++resource++zms_/jquery/jcrop/jquery.Jcrop.css']
+                files: ['/++resource++zms_/jquery/jcrop/jquery.Jcrop.min.js?ts='+escape(new Date()),
+                                '/++resource++zms_/jquery/jcrop/jquery.Jcrop.css?ts='+escape(new Date())]
                 });
         $.plugin('jcrop').get('body',c);

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

@@ -122 +122 @@
                         cached = cache[url],
                         caching = (defaults.cache === true || defaults.cache == 'true');
-        
+                if(extension.indexOf('?')>0) {
+                        extension = extension.substr(0,extension.indexOf('?'));
+                }
                 if(extension != 'css' && extension != 'js') {
                         throw new Error( '$.plugin.getFile(url) - Invalid extension:'+ extension + '\n\t'+url); return this;}

ZMS/trunk/plugins/www/objattrs/zmi.blob.ZMSGraphic_extEdit.js

@@ -199 +199 @@
         if (available) {
                 runPluginJcrop(function() {
-                        $ZMSGraphic_cropapi = $.Jcrop($ZMSGraphic_img,{
+                        $ZMSGraphic_img.Jcrop({
                                         allowSelect     : false,
+                                        setSelect: [ 0, 0, 25, 25 ],
                                         minSize         : [25, 25],
                                         maxSize         : [ZMSGraphic_act_width, ZMSGraphic_act_height],
@@ -206 +207 @@
                                         onChange        : ZMSGraphic_extEdit_changedSelection,
                                         onSelect        : ZMSGraphic_extEdit_changedSelection
-                                });
-                        $ZMSGraphic_cropapi.setOptions({ allowResize: true, allowMove: cropping});
-                        $ZMSGraphic_cropapi.focus();
+                                },function() {
+                                        $ZMSGraphic_cropapi = this;
+                                        $ZMSGraphic_cropapi.setOptions({ allowResize: true, allowMove: cropping});
+                                        $ZMSGraphic_cropapi.focus();
+                                });
                 });
         }