Skip to content

Commit

Permalink
[update] version 3.1.1
Browse files Browse the repository at this point in the history
  • Loading branch information
AlexKlimenkov committed Dec 23, 2014
1 parent 398c492 commit ee46edb
Show file tree
Hide file tree
Showing 86 changed files with 309 additions and 258 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "gantt",
"version": "3.1.0",
"version": "3.1.1",
"homepage": "http://dhtmlx.com/docs/products/dhtmlxGantt/",
"description": "JavaScript event calendar. Allows to manage events and appointments in different views",
"main": [
Expand Down
2 changes: 1 addition & 1 deletion codebase/connector/combo_connector.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ function select(){
function to_xml_start(){
if ($this->skip) return "";

return "<option ".($this->selected?"selected='true'":"")."value='".$this->get_id()."'><![CDATA[".$this->data[$this->config->text[0]["name"]]."]]>";
return "<option ".($this->selected?"selected='true'":"")."value='".$this->xmlentities($this->get_id())."'><![CDATA[".$this->data[$this->config->text[0]["name"]]."]]>";
}
/*! return self as XML string, ending part
*/
Expand Down
2 changes: 1 addition & 1 deletion codebase/connector/db_phpcake.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ public function select($sql){
else
$res = $this->connection->find("all");

$temp = array();
if (sizeof($res)){
$name = get_class($this->connection);
$temp = array();
for ($i=sizeof($res)-1; $i>=0; $i--)
$temp[]=&$res[$i][$name];
}
Expand Down
6 changes: 4 additions & 2 deletions codebase/connector/db_phpci.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,10 @@ public function query($sql){
if ($res===false) {
throw new Exception("CI - sql execution failed");
}

return new PHPCIResultSet($res);

if (is_object($res))
return new PHPCIResultSet($res);
return new ArrayQueryWrapper(array());
}

public function get_next($res){
Expand Down
2 changes: 1 addition & 1 deletion codebase/connector/db_phpyii.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ public function select($sql){
else
$res = $this->connection->findAll();

$temp = array();
if (sizeof($res)){
$temp = array();
foreach ($res as $obj)
$temp[]=$obj->getAttributes();
}
Expand Down
10 changes: 5 additions & 5 deletions codebase/connector/gantt_connector.php
Original file line number Diff line number Diff line change
Expand Up @@ -131,15 +131,15 @@ public function render_links($table,$id="",$fields=false,$extra=false,$relation_
class GanttDataProcessor extends DataProcessor{
function name_data($data){
if ($data=="start_date")
return $this->config->text[0]["db_name"];
return $this->config->text[0]["name"];
if ($data=="id")
return $this->config->id["db_name"];
return $this->config->id["name"];
if ($data=="duration" && $this->config->text[1]["name"] == "duration")
return $this->config->text[1]["db_name"];
return $this->config->text[1]["name"];
if ($data=="end_date" && $this->config->text[1]["name"] == "end_date")
return $this->config->text[1]["db_name"];
return $this->config->text[1]["name"];
if ($data=="text")
return $this->config->text[2]["db_name"];
return $this->config->text[2]["name"];

return $data;
}
Expand Down
4 changes: 2 additions & 2 deletions codebase/dhtmlxgantt.css

Large diffs are not rendered by default.

156 changes: 78 additions & 78 deletions codebase/dhtmlxgantt.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion codebase/ext/dhtmlxgantt_marker.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion codebase/ext/dhtmlxgantt_quick_info.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions codebase/ext/dhtmlxgantt_tooltip.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion codebase/locale/locale.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion codebase/locale/locale_ar.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion codebase/locale/locale_be.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion codebase/locale/locale_ca.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion codebase/locale/locale_cn.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion codebase/locale/locale_cs.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion codebase/locale/locale_da.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion codebase/locale/locale_de.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion codebase/locale/locale_el.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion codebase/locale/locale_es.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion codebase/locale/locale_fi.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion codebase/locale/locale_fr.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion codebase/locale/locale_he.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion codebase/locale/locale_hu.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion codebase/locale/locale_id.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion codebase/locale/locale_it.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion codebase/locale/locale_jp.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 11 additions & 0 deletions codebase/locale/locale_kr.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion codebase/locale/locale_nb.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion codebase/locale/locale_nl.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion codebase/locale/locale_no.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion codebase/locale/locale_pl.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion codebase/locale/locale_pt.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion codebase/locale/locale_ro.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion codebase/locale/locale_ru.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion codebase/locale/locale_si.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion codebase/locale/locale_sk.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion codebase/locale/locale_sv.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion codebase/locale/locale_tr.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion codebase/locale/locale_ua.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions codebase/skins/dhtmlxgantt_broadway.css

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions codebase/skins/dhtmlxgantt_meadow.css

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions codebase/skins/dhtmlxgantt_skyblue.css

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions codebase/skins/dhtmlxgantt_terrace.css

Large diffs are not rendered by default.

Loading

0 comments on commit ee46edb

Please sign in to comment.