From a4b00dc4b5b8452f7eb6888f9f8da5d2d96cfca3 Mon Sep 17 00:00:00 2001
From: Tihomir Mihaylov <ttm@artwishstudio.com>
Date: Wed, 9 Dec 2015 01:00:30 -0500
Subject: [PATCH] separate js code

---
 classes/Output.php   | 34 ++++++++++------------------------
 js/OutputFileTree.js | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 24 deletions(-)
 create mode 100644 js/OutputFileTree.js

diff --git a/classes/Output.php b/classes/Output.php
index bfc02de..84093e1 100644
--- a/classes/Output.php
+++ b/classes/Output.php
@@ -468,8 +468,8 @@ private static function initFileTreeView($id=null, $base=0)
 	WPFB_Core::$load_js = true;
 	
 	// see Core::EnqueueScripts(), where scripts are enqueued if late script loading is disabled
-	wp_print_scripts('jquery-treeview-async');
-	wp_print_styles('jquery-treeview');
+	wp_enqueue_script('jquery-treeview-async');
+	wp_enqueue_style('jquery-treeview');
 			
 	if($id == null)
 		return;
@@ -484,28 +484,14 @@ private static function initFileTreeView($id=null, $base=0)
 	if(is_admin()) $ajax_data['is_admin'] = true;
 	
 	$jss = md5($id);
-	?>
-<script type="text/javascript">
-//<![CDATA[
-function wpfb_initfb<?php echo $jss ?>() {	jQuery("#<?php echo $id ?>").treeview(wpfb_fbsets<?php echo $jss ?>={url: "<?php echo WPFB_Core::$ajax_url_public ?>",
-ajax:{data:<?php echo json_encode($ajax_data); ?>,type:"post",error:function(x,status,error){if(error) alert(error);},complete:function(x,status){if(typeof(wpfb_setupLinks)=='function')wpfb_setupLinks();}},
-animated: "medium"}).data("settings",wpfb_fbsets<?php echo $jss ?>);
-}
-jQuery(document).ready(function(){
-	var fel=jQuery("#<?php echo $id ?>");
-	if('function' != typeof fel.treeview) {
-		jQuery.when(
-<?php global $wp_scripts; $treeview_scripts = array('jquery-treeview','jquery-treeview-edit', 'jquery-treeview-async');
-foreach($treeview_scripts as $ts) { ?>
-			 jQuery.getScript('<?php echo esc_js($wp_scripts->registered[$ts]->src); ?>'),
-<?php } ?>
-			 jQuery.Deferred(function( deferred ){ jQuery( deferred.resolve ); })
-		).done(function(){ wpfb_initfb<?php echo $jss ?>(); });
-	} else {	wpfb_initfb<?php echo $jss ?>();	}
-});
-//]]>
-</script>
-<?php
+
+	$script_params = array(
+		'url' => WPFB_Core::$ajax_url_public,
+	);
+
+	wp_register_script('output_file_tree', plugins_url('/WP-Filebase/js/OutputFileTree.js'), ['jquery-treeview','jquery-treeview-edit', 'jquery-treeview-async'], true);
+	wp_localize_script('output_file_tree', 'params', $script_params);
+	wp_enqueue_script('output_file_tree');
 }
 
 static function GeneratePage($title, $content, $prepend_to_current=false) {
diff --git a/js/OutputFileTree.js b/js/OutputFileTree.js
new file mode 100644
index 0000000..353346a
--- /dev/null
+++ b/js/OutputFileTree.js
@@ -0,0 +1,33 @@
+jQuery(function($) {
+
+	$("ul[id^='wpfb-filebrowser']").each(function(i, obj) {
+
+		var base_id = $(obj).data('base');
+		var wpfb_id = $(obj).data('wpfb');
+		var wpfb_element_id = $(obj).attr('id');
+		
+	    $(obj).treeview(wpfb_element_id={
+	      url: params.url,
+	      ajax: {
+	        data:{
+	        	"wpfb_action":"tree",
+	        	"type":"browser",
+	        	"base": base_id
+	        },
+	        type:'post',
+	        error:function(x,status,error) {
+	          if(error) alert(error);
+	        },
+	        complete: function(x,status) {
+	          if (typeof(wpfb_setupLinks)=='function') {
+	            wpfb_setupLinks();
+	          }
+	        }
+	      },
+	      animated: 'medium'
+	      }
+	    )
+	    .data('settings', wpfb_element_id);
+	});
+	
+});