Skip to content

Commit

Permalink
Upgrade to Agile Core 1.2.1, for #129
Browse files Browse the repository at this point in the history
  • Loading branch information
romaninsh committed Apr 12, 2017
1 parent 0b36f62 commit 6f23436
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion src/CRUD.php
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public function setModel(\atk4\data\Model $m, $defaultFields = null)

return [
(new jQuery($this))->trigger('reload'),
new jsExpression('$("#atk-dialog-content").trigger("close")'),
new jsExpression('$(".atk-dialog-content").trigger("close")'),
];
});
});
Expand Down
2 changes: 1 addition & 1 deletion src/Callback.php
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class Callback
*/
public function __construct($defaults = [])
{
$this->setProperties($defaults);
$this->setDefaults($defaults);
}

/**
Expand Down
10 changes: 5 additions & 5 deletions src/View.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class View implements jsExpressionable
use \atk4\core\AppScopeTrait;
use \atk4\core\FactoryTrait;
use \atk4\core\DIContainerTrait {
setProperties as _setProperties;
setDefaults as _setDefaults;
setMissingProperty as _setMissingProperty;
}

Expand Down Expand Up @@ -160,7 +160,7 @@ public function __construct($defaults = [])
throw new Exception(['Constructor requires array argument', 'arg' => $defaults]);
}

$this->setProperties($defaults);
$this->setDefaults($defaults);

if (is_string($this->class)) {
$this->class = explode(' ', $this->class);
Expand Down Expand Up @@ -223,14 +223,14 @@ public function setSource(array $data)
*
* @param array $properties
*/
protected function setProperties($properties)
protected function setDefaults($properties)
{
if (isset($properties[0]) && $this->content !== false) {
$this->content = $properties[0];
unset($properties[0]);
}

$this->_setProperties($properties);
$this->_setDefaults($properties);
}

/**
Expand Down Expand Up @@ -450,7 +450,7 @@ public function set($arg1 = [], $arg2 = null)
}

if (is_array($arg1)) {
$this->setProperties($arg1);
$this->setDefaults($arg1);

return $this;
}
Expand Down

0 comments on commit 6f23436

Please sign in to comment.