Merge branch 'claudio-dev' of github.com:Sankore/Sankore-3.1 into claudio-dev

resources/library/applications/Nuancier.wgt/js/colorpicker.js

@@ -70,12 +70,12 @@
                 $("div.tools_change").removeClass("tools_compass");
                 window.sankore.setTool('pen');              
                 window.sankore.setPenColor('#' + HSBToHex(hsb));
-                sankore.returnStatus("PEN installed", penFlag);
+                //sankore.returnStatus("PEN installed", penFlag);
             } else {
                 $("div.tools_change").addClass("tools_compass");
                 window.sankore.setTool('compass');              
                 window.sankore.setPenColor('#' + HSBToHex(hsb));
-                sankore.returnStatus("Compass installed", penFlag);
+                //sankore.returnStatus("Compass installed", penFlag);
             }
         },
         keyDown = function (ev) {
@@ -224,12 +224,12 @@
                 $("div.tools_change").removeClass("tools_compass");
                 window.sankore.setTool('pen');
                 window.sankore.setPenColor('#' + HSBToHex(tmpColor.b));
-                sankore.returnStatus("PEN installed", penFlag);
+                //sankore.returnStatus("PEN installed", penFlag);
             } else {
                 $("div.tools_change").addClass("tools_compass");
                 window.sankore.setTool('compass');
                 window.sankore.setPenColor('#' + HSBToHex(tmpColor.b));
-                sankore.returnStatus("Compass installed", penFlag);
+                //sankore.returnStatus("Compass installed", penFlag);
             }
             //$(tmpColor.a).data('colorpicker').newColor.css('backgroundColor', '#' + HSBToHex(tmpColor.b));
             return false;
@@ -261,7 +261,7 @@
             cal.data('colorpicker').onSubmit(col, HSBToHex(col), HSBToRGB(col), cal.data('colorpicker').el);
             penFlag = (penFlag)?false:true;
             setNewColor(col, cal.get(0));
-            sankore.returnStatus("startEditing()", penFlag);
+            //sankore.returnStatus("startEditing()", penFlag);
         },
         show = function (ev) {
             var cal = $('#' + $(this).data('colorpickerId'));
@@ -604,4 +604,4 @@
         ColorPickerShow: ColorPicker.showPicker,
         ColorPickerSetColor: ColorPicker.setColor
     });
-})(jQuery)
+})(jQuery)

src/board/UBFeaturesController.cpp

@@ -260,6 +260,7 @@ bool UBFeature::isDeletable() const
             || elementType == FEATURE_AUDIO
             || elementType == FEATURE_VIDEO
             || elementType == FEATURE_IMAGE
+            || elementType == FEATURE_FLASH
             || elementType == FEATURE_FOLDER;
 }
 

src/board/UBFeaturesController.h

@@ -73,14 +73,14 @@ enum UBFeatureElementType
     FEATURE_VIRTUALFOLDER,
     FEATURE_FOLDER,
     FEATURE_INTERACTIVE,
-	FEATURE_INTERNAL,
+    FEATURE_INTERNAL,
     FEATURE_ITEM,
     FEATURE_AUDIO,
     FEATURE_VIDEO,
     FEATURE_IMAGE,
     FEATURE_FLASH,
-	FEATURE_TRASH,
-	FEATURE_FAVORITE,
+    FEATURE_TRASH,
+    FEATURE_FAVORITE,
     FEATURE_SEARCH,
     FEATURE_INVALID
 };