From d09cfc1449c9362246966e83c02bed48dc9c52e9 Mon Sep 17 00:00:00 2001
From: unknown <D:\mail>
Date: Mon, 25 Jun 2012 19:04:33 +0200
Subject: [PATCH] fixed orde images widget

---
 .../Ordre images.wgt/index.html               | 11 +++---
 .../Ordre images.wgt/js/script.js             | 37 +++++++++++++-----
 .../Ordre images.wgt/locales/fr/js/script.js  | 37 +++++++++++++-----
 .../Ordre images.wgt/locales/ru/js/script.js  | 38 ++++++++++++++-----
 4 files changed, 90 insertions(+), 33 deletions(-)

diff --git a/resources/library/interactivities/Ordre images.wgt/index.html b/resources/library/interactivities/Ordre images.wgt/index.html
index 5b38539e..e8e11b60 100644
--- a/resources/library/interactivities/Ordre images.wgt/index.html	
+++ b/resources/library/interactivities/Ordre images.wgt/index.html	
@@ -5,7 +5,7 @@
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
         <link rel="stylesheet" type="text/css" href="css/basic.css"/>
         <link rel="stylesheet" href="css/fonts/Lobster/stylesheet.css">
-	<link rel="stylesheet" href="css/fonts/SF-Toontime/stylesheet.css">	
+        <link rel="stylesheet" href="css/fonts/SF-Toontime/stylesheet.css">	
         <script type="text/javascript" src="js/jquery-1.6.2.min.js"></script>
         <script type="text/javascript" src="js/jquery-ui-1.8.9.custom.min.js"></script>
         <script type="text/javascript" src="js/script.js"></script>
@@ -17,7 +17,8 @@
                 } else 
                     lang = "en";
                 if(lang == "en"){
-                    sankore.enableDropOnWidget(false);
+                    if(window.sankore)
+                        sankore.enableDropOnWidget(false);
                     start();
                 }
                 else{
@@ -57,17 +58,17 @@
                 </td>
                 <td class="b_top_right">&nbsp;</td>
             </tr>
-       
+
             <tr>
                 <td class="b_center_left">&nbsp;</td>
                 <td>
                     <div id="data">
-                        
+
                     </div>
                 </td>
                 <td class="b_center_right">&nbsp;</td>
             </tr>     
-        
+
             <tr style="height: 54px;">
                 <td class="b_bottom_left">&nbsp;</td>
                 <td class="b_bottom_center">&nbsp;</td>
diff --git a/resources/library/interactivities/Ordre images.wgt/js/script.js b/resources/library/interactivities/Ordre images.wgt/js/script.js
index 22b08946..f2992318 100644
--- a/resources/library/interactivities/Ordre images.wgt/js/script.js	
+++ b/resources/library/interactivities/Ordre images.wgt/js/script.js	
@@ -34,12 +34,21 @@ function start(){
     //events
     if (window.widget) {
         window.widget.onleave = function(){
-            //exportData();
+            exportData();
         }
     }
     
     $("#wgt_reload").click(function(){
-        window.location.reload();
+        if($("#wgt_display").hasClass("selected")){
+            $("#wgt_edit").trigger("click");
+            $("#wgt_display").trigger("click");
+        } else {
+            $("#wgt_display").trigger("click");
+        }
+    });
+    
+    $("#wgt_reload, #wgt_display, #wgt_edit").mouseover(function(){
+        exportData();
     });
     
     $(".style_select").change(function (event){
@@ -204,6 +213,10 @@ function exportData(){
         array_to_export.push(cont_obj);
     }
     sankore.setPreference("odr_des_imgs", JSON.stringify(array_to_export));
+    if($("#wgt_display").hasClass("selected"))
+        sankore.setPreference("odr_des_imgs_state", "display");
+    else
+        sankore.setPreference("odr_des_imgs_state", "edit");
 }
 
 //import
@@ -240,13 +253,19 @@ function importData(data){
                 img_block.append(hidden_input).append(img);
                 tmp_array.push(img_block);
             }
-            tmp_array = shuffle(tmp_array);
+            if(sankore.preference("odr_des_imgs_state","")){
+                if(sankore.preference("odr_des_imgs_state","") == "edit")
+                    tmp_array = shuffle(tmp_array);
+            } else 
+                tmp_array = shuffle(tmp_array);
+            
             for(j = 0; j<tmp_array.length;j++)
                 tmp_array[j].appendTo(imgs_container);
-            imgs_container.sortable( {
-                update: checkResult
-            } );   
+            imgs_container.sortable().bind('sortupdate', function(event, ui) {
+                checkResult(event);
+            }); 
             container.appendTo("#data"); 
+            imgs_container.trigger("sortupdate")                          
         }        
     }
 }
@@ -286,9 +305,9 @@ function showExample(){
     tmp_array = shuffle(tmp_array);
     for(var i = 0; i<tmp_array.length;i++)
         tmp_array[i].appendTo(imgs_container);
-    imgs_container.sortable( {
-        update: checkResult
-    } );
+    imgs_container.sortable().bind('sortupdate', function(event, ui) {
+        checkResult(event);
+    });
 
     container.appendTo("#data");
 }
diff --git a/resources/library/interactivities/Ordre images.wgt/locales/fr/js/script.js b/resources/library/interactivities/Ordre images.wgt/locales/fr/js/script.js
index 2feefc9e..c052fce5 100644
--- a/resources/library/interactivities/Ordre images.wgt/locales/fr/js/script.js	
+++ b/resources/library/interactivities/Ordre images.wgt/locales/fr/js/script.js	
@@ -35,12 +35,21 @@ function start(){
     //events
     if (window.widget) {
         window.widget.onleave = function(){
-            //exportData();
+            exportData();
         }
     }
     
     $("#wgt_reload").click(function(){
-        window.location.reload();
+        if($("#wgt_display").hasClass("selected")){
+            $("#wgt_edit").trigger("click");
+            $("#wgt_display").trigger("click");
+        } else {
+            $("#wgt_display").trigger("click");
+        }
+    });
+    
+    $("#wgt_reload, #wgt_display, #wgt_edit").mouseover(function(){
+        exportData();
     });
     
     $(".style_select").change(function (event){
@@ -205,6 +214,10 @@ function exportData(){
         array_to_export.push(cont_obj);
     }
     sankore.setPreference("odr_des_imgs", JSON.stringify(array_to_export));
+    if($("#wgt_display").hasClass("selected"))
+        sankore.setPreference("odr_des_imgs_state", "display");
+    else
+        sankore.setPreference("odr_des_imgs_state", "edit");
 }
 
 //import
@@ -240,13 +253,19 @@ function importData(data){
                 img_block.append(hidden_input).append(img);
                 tmp_array.push(img_block);
             }
-            tmp_array = shuffle(tmp_array);
+            if(sankore.preference("odr_des_imgs_state","")){
+                if(sankore.preference("odr_des_imgs_state","") == "edit")
+                    tmp_array = shuffle(tmp_array);
+            } else 
+                tmp_array = shuffle(tmp_array);
+            
             for(j = 0; j<tmp_array.length;j++)
                 tmp_array[j].appendTo(imgs_container);
-            imgs_container.sortable( {
-                update: checkResult
-            } );   
+            imgs_container.sortable().bind('sortupdate', function(event, ui) {
+                checkResult(event);
+            }); 
             container.appendTo("#data"); 
+            imgs_container.trigger("sortupdate")  
         }
     }
 }
@@ -286,9 +305,9 @@ function showExample(){
     tmp_array = shuffle(tmp_array);
     for(var i = 0; i<tmp_array.length;i++)
         tmp_array[i].appendTo(imgs_container);
-    imgs_container.sortable( {
-        update: checkResult
-    } );
+    imgs_container.sortable().bind('sortupdate', function(event, ui) {
+        checkResult(event);
+    });
 
     container.appendTo("#data");
 }
diff --git a/resources/library/interactivities/Ordre images.wgt/locales/ru/js/script.js b/resources/library/interactivities/Ordre images.wgt/locales/ru/js/script.js
index 814cc59e..861a4ea8 100644
--- a/resources/library/interactivities/Ordre images.wgt/locales/ru/js/script.js	
+++ b/resources/library/interactivities/Ordre images.wgt/locales/ru/js/script.js	
@@ -35,12 +35,21 @@ function start(){
     //events
     if (window.widget) {
         window.widget.onleave = function(){
-            //exportData();
+            exportData();
         }
     }
     
     $("#wgt_reload").click(function(){
-        window.location.reload();
+        if($("#wgt_display").hasClass("selected")){
+            $("#wgt_edit").trigger("click");
+            $("#wgt_display").trigger("click");
+        } else {
+            $("#wgt_display").trigger("click");
+        }
+    });
+    
+    $("#wgt_reload, #wgt_display, #wgt_edit").mouseover(function(){
+        exportData();
     });
     
     $(".style_select").change(function (event){
@@ -205,6 +214,10 @@ function exportData(){
         array_to_export.push(cont_obj);
     }
     sankore.setPreference("odr_des_imgs", JSON.stringify(array_to_export));
+    if($("#wgt_display").hasClass("selected"))
+        sankore.setPreference("odr_des_imgs_state", "display");
+    else
+        sankore.setPreference("odr_des_imgs_state", "edit");
 }
 
 //import
@@ -240,13 +253,19 @@ function importData(data){
                 img_block.append(hidden_input).append(img);
                 tmp_array.push(img_block);
             }
-            tmp_array = shuffle(tmp_array);
+            if(sankore.preference("odr_des_imgs_state","")){
+                if(sankore.preference("odr_des_imgs_state","") == "edit")
+                    tmp_array = shuffle(tmp_array);
+            } else 
+                tmp_array = shuffle(tmp_array);
+            
             for(j = 0; j<tmp_array.length;j++)
                 tmp_array[j].appendTo(imgs_container);
-            imgs_container.sortable( {
-                update: checkResult
-            } );   
+            imgs_container.sortable().bind('sortupdate', function(event, ui) {
+                checkResult(event);
+            }); 
             container.appendTo("#data"); 
+            imgs_container.trigger("sortupdate")  
         }
     }
 }
@@ -286,9 +305,9 @@ function showExample(){
     tmp_array = shuffle(tmp_array);
     for(var i = 0; i<tmp_array.length;i++)
         tmp_array[i].appendTo(imgs_container);
-    imgs_container.sortable( {
-        update: checkResult
-    } );
+    imgs_container.sortable().bind('sortupdate', function(event, ui) {
+        checkResult(event);
+    });
 
     container.appendTo("#data");
 }
@@ -467,4 +486,3 @@ function onDropTarget(obj, event) {
     }
     return false;
 }
-