[update] version 4.1

Author: AlexKlimenkov

README.md

@@ -1,4 +1,4 @@
-dhtmlxGantt v.4.0
+dhtmlxGantt v.4.1
 =================
 
 dhtmlxGantt is an open source JavaScript Gantt chart that helps you illustrate a project schedule in a nice-looking chart. It can show the dependencies between tasks as lines and allows you to set up different relationships between tasks (finish-to-start, start-to-start, end-to-end). dhtmlxGantt provides flexible API and a large number of event handles, which gives you the freedom to customize it for your needs. 

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "gantt",
-  "version": "4.0.0",
+  "version": "4.1.0",
   "homepage": "http://dhtmlx.com/docs/products/dhtmlxGantt/",
   "description": "An open source JavaScript Gantt chart that helps you illustrate a project schedule in a nice-looking chart.",
   "main": [

codebase/connector/base_connector.php

@@ -700,6 +700,9 @@ protected function end_run(){
 	*/
 	public function set_encoding($encoding){
 		$this->encoding=$encoding;
+		if ($this->live_update !== false) {
+			$this->live_update->set_encoding($this->encoding);
+		}
 	}
 
 	/*! enable or disable dynamic loading mode
@@ -854,9 +857,10 @@ public function update($data) {
 		@param url
 			url used for update notifications
 	*/	
-	public function enable_live_update($table, $url=false){
-        $this->live_update = new $this->live_update_data_type($this->sql, $this->config, $this->request, $table,$url, array("connector" => $this));
+	public function enable_live_update($table, $url=false, $origin_table = false){
+        $this->live_update = new $this->live_update_data_type($this->sql, $this->config, $this->request, $table,$url, array("connector" => $this, "table" => $origin_table));
         $this->live_update->set_event($this->event,$this->names["item_class"]);
+		$this->live_update->set_encoding($this->encoding);
 		$this->event->attach("beforeOutput", 		Array($this->live_update, "version_output"));
 		$this->event->attach("beforeFiltering", 	Array($this->live_update, "get_updates"));
 		$this->event->attach("beforeProcessing", 	Array($this->live_update, "check_collision"));

codebase/connector/db_common.php

@@ -217,7 +217,6 @@ public function set_source($value){
 		if (is_string($value))
 			$value = trim($value);
 		$this->source = $value;
-		if (!$this->source) throw new Exception("Source of data can't be empty");
 	}
 	/*! sets data limits
 		

codebase/connector/update.php

@@ -104,12 +104,13 @@ class DataUpdate{
 
 	protected $table; //!< table , where actions are stored
 	protected $url; //!< url for notification service, optional
-    protected $sql; //!< DB wrapper object
-    protected $config; //!< DBConfig object
-    protected $request; //!< DBRequestConfig object
-    protected $event;
-    protected $item_class;
-    protected $demu;
+	protected $sql; //!< DB wrapper object
+	protected $config; //!< DBConfig object
+	protected $request; //!< DBRequestConfig object
+	protected $encoding="utf-8";
+	protected $event;
+	protected $item_class;
+	protected $demu;
 
 	//protected $config;//!< DataConfig instance
 	//protected $request;//!< DataRequestConfig instance
@@ -141,8 +142,16 @@ public function set_event($master, $name){
         $this->event = $master;
         $this->item_class = $name;
     }
+
+    public function set_encoding($encoding){
+        $this->encoding = $encoding;
+    }
 
 	protected function select_update($actions_table, $join_table, $id_field_name, $version, $user) {
+
+		if ($this->options["table"] !== false)
+			$join_table = $this->options["table"];
+
 		$sql = "SELECT $join_table.*, {$actions_table}.id, {$actions_table}.dataId, {$actions_table}.type as action_table_type, {$actions_table}.user FROM  {$actions_table}";
 		$sql .= " LEFT OUTER JOIN {$join_table} ON ";
 		$sql .= "{$actions_table}.DATAID = {$join_table}.{$id_field_name} ";
@@ -218,8 +227,8 @@ public function get_updates() {
 		$output = $this->render_set($this->sql->select($sub_request), $this->item_class);
 
 		ob_clean();
-		header("Content-type:text/xml");
-        
+		header("Content-type:text/xml; charset=".$this->encoding);
+
 		echo $this->updates_start();
 		echo $this->get_version();
 		echo $output;
@@ -342,4 +351,4 @@ protected function output($res){
 
 }
 
-?>
+?>