add jqueryDone to dropzone

Author: jcheron

Ajax/service/Javascript.php

@@ -1,28 +1,30 @@
 <?php
-
 namespace Ajax\service;
 
 class Javascript {
-	public static $preventDefault="\nif(event && event.preventDefault) event.preventDefault();\n";
-	public static $stopPropagation="\nif(event && event.stopPropagation) event.stopPropagation();\n";
 
-	public static function draggable($attr="id"){
-		return 'var dt=event.dataTransfer || event.originalEvent.dataTransfer;dt.setData("text/plain",JSON.stringify({id:$(event.target).attr("id"),data:$(event.target).attr("'.$attr.'")}));';
+	public static $preventDefault = "\nif(event && event.preventDefault) event.preventDefault();\n";
+
+	public static $stopPropagation = "\nif(event && event.stopPropagation) event.stopPropagation();\n";
+
+	public static function draggable($attr = "id") {
+		return 'var dt=event.dataTransfer || event.originalEvent.dataTransfer;dt.setData("text/plain",JSON.stringify({id:$(event.target).attr("id"),data:$(event.target).attr("' . $attr . '")}));';
 	}
-	
-	public static function dropZone($jqueryDone,$jsCallback=""){
-		return 'var dt=event.dataTransfer || event.originalEvent.dataTransfer;var _data=JSON.parse(dt.getData("text/plain"));$(event.target).'.$jqueryDone.'($("#"+_data.id));var data=_data.data;'.$jsCallback;
+
+	public static function dropZone($jqueryDone, $jsCallback = "") {
+		$done = ($jqueryDone != null) ? '$(event.target).' . $jqueryDone . '($("#"+_data.id));' : '';
+		return 'var dt=event.dataTransfer || event.originalEvent.dataTransfer;var _data=JSON.parse(dt.getData("text/plain"));' . $done . 'var data=_data.data;' . $jsCallback;
 	}
-	
-	public static function containsCode($expression){
-		return strrpos($expression, 'this')!==false||strrpos($expression, 'event')!==false||strrpos($expression, 'self')!==false;
+
+	public static function containsCode($expression) {
+		return strrpos($expression, 'this') !== false || strrpos($expression, 'event') !== false || strrpos($expression, 'self') !== false;
 	}
-	
-	public static function isFunction($jsCode){
+
+	public static function isFunction($jsCode) {
 		return JString::startswith($jsCode, "function");
 	}
-	
-	public static function fileUploadBehavior($id=''){
+
+	public static function fileUploadBehavior($id = '') {
 		return "$('input:text, .ui.button', '#{$id}').on('click', function (e) {e.preventDefault();\$('input:file', '#{$id}').click();});
 				$('input:file', '#{$id}').on('change', function (e) {if(e.target.files.length){var name = e.target.files[0].name;$('input:text', $(e.target).parent()).val(name);}});";
 	}
@@ -36,8 +38,8 @@ public static function fileUploadBehavior($id=''){
 	 * @return string
 	 */
 	public static function prep_element($element) {
-		if (self::containsCode($element)===false) {
-			$element='"'.addslashes($element).'"';
+		if (self::containsCode($element) === false) {
+			$element = '"' . addslashes($element) . '"';
 		}
 		return $element;
 	}
@@ -52,18 +54,24 @@ public static function prep_element($element) {
 	 */
 	public static function prep_value($value) {
 		if (\is_array($value)) {
-			$value=implode(",", $value);
+			$value = implode(",", $value);
 		}
-		if (self::containsCode($value)===false) {
-			$value=\str_replace(["\\","\""], ["\\\\","\\\""], $value);
-			$value='"'.$value.'"';
+		if (self::containsCode($value) === false) {
+			$value = \str_replace([
+				"\\",
+				"\""
+			], [
+				"\\\\",
+				"\\\""
+			], $value);
+			$value = '"' . $value . '"';
 		}
-		return trim($value,"%");
+		return trim($value, "%");
 	}
 
-	public static function prep_jquery_selector($value){
-		if(JString::startswith($value, '$(')===false){
-			return '$('.self::prep_value($value).')';
+	public static function prep_jquery_selector($value) {
+		if (JString::startswith($value, '$(') === false) {
+			return '$(' . self::prep_value($value) . ')';
 		}
 		return $value;
 	}