Skip to content
This repository has been archived by the owner on May 3, 2024. It is now read-only.

Commit

Permalink
Merge branch 'hotfix/#116'
Browse files Browse the repository at this point in the history
  • Loading branch information
Julian-B90 committed Dec 23, 2014
2 parents 00738c4 + 142cd1b commit 06faae3
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 10 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@ bump-ver
upd-booster
/zip
/.project
/.settings
/.settings
.idea/
3 changes: 2 additions & 1 deletion CHANGELOG.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
X-editable-yii changelog
============================

Version 1.3.2 wip
Version 1.3.2 Dec 23, 2014
----------------------------
[enh #65] treat `params` as php expression for EditableColumn (vitalets)
[bug #116] Memory leak in EditableColumn (Julian-B90)


Version 1.3.1 Aug 17, 2013
Expand Down
6 changes: 3 additions & 3 deletions Editable.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @author Vitaliy Potapov <[email protected]>
* @link https://github.com/vitalets/x-editable-yii
* @copyright Copyright &copy; Vitaliy Potapov 2012
* @version 1.3.1
* @version 1.3.2
*/

/**
Expand Down Expand Up @@ -524,8 +524,8 @@ public function registerClientScript()

//wrap in anonymous function for live update
if($this->liveTarget) {
$script .= "\n $('body').on('ajaxUpdate.editable', function(e){ if(e.target.id == '".$this->liveTarget."') yiiEditable(); });";
$script = "(function yiiEditable() {\n ".$script."\n}());";
$script2 = "\n$('body').on('ajaxUpdate.editable',function(e){ if(e.target.id == '".$this->liveTarget."') yiiEditable2(); });";
$script = "(function yiiEditable() {function yiiEditable2() {\n\t$script\n} $script2 yiiEditable2(); }\n());";
}

Yii::app()->getClientScript()->registerScript(__CLASS__ . '-' . $selector, $script);
Expand Down
2 changes: 1 addition & 1 deletion EditableColumn.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @author Vitaliy Potapov <[email protected]>
* @link https://github.com/vitalets/x-editable-yii
* @copyright Copyright &copy; Vitaliy Potapov 2012
* @version 1.3.1
* @version 1.3.2
*/

Yii::import('editable.EditableField');
Expand Down
2 changes: 1 addition & 1 deletion EditableConfig.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @author Vitaliy Potapov <[email protected]>
* @link https://github.com/vitalets/x-editable-yii
* @copyright Copyright &copy; Vitaliy Potapov 2012
* @version 1.3.1
* @version 1.3.2
*/

class EditableConfig extends CApplicationComponent
Expand Down
2 changes: 1 addition & 1 deletion EditableDetailView.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @author Vitaliy Potapov <[email protected]>
* @link https://github.com/vitalets/x-editable-yii
* @copyright Copyright &copy; Vitaliy Potapov 2012
* @version 1.3.1
* @version 1.3.2
*/

Yii::import('editable.EditableField');
Expand Down
2 changes: 1 addition & 1 deletion EditableField.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @author Vitaliy Potapov <[email protected]>
* @link https://github.com/vitalets/x-editable-yii
* @copyright Copyright &copy; Vitaliy Potapov 2012
* @version 1.3.1
* @version 1.3.2
*/

Yii::import('editable.Editable');
Expand Down
2 changes: 1 addition & 1 deletion EditableSaver.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @author Vitaliy Potapov <[email protected]>
* @link https://github.com/vitalets/x-editable-yii
* @copyright Copyright &copy; Vitaliy Potapov 2012
* @version 1.3.1
* @version 1.3.2
*/

/**
Expand Down

0 comments on commit 06faae3

Please sign in to comment.