Skip to content

Commit 74f8f1e

Browse files
committed
Beta-5
1 parent d218720 commit 74f8f1e

File tree

5 files changed

+39
-22
lines changed

5 files changed

+39
-22
lines changed

develnext-bundles/dn-httpclient-bundle/src/vendor/develnext.bundle.httpclient.HttpClientBundle/bundle/http/HttpDownloader.php

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,8 @@ public function download($url, $fileName = null)
173173
}
174174
}
175175

176-
$fileName = $this->destDirectory ? "$this->destDirectory/$fileName" : $fileName;
176+
$fileName = fs::normalize($this->destDirectory ? "$this->destDirectory/$fileName" : $fileName);
177+
177178
$this->_urlStats->set($url, [
178179
'url' => $url, 'response' => $response, 'file' => $fileName, 'size' => $contentLength, 'progress' => 0, 'status' => 'DOWNLOADING'
179180
]);
@@ -373,11 +374,15 @@ public function start()
373374

374375

375376
if ($countDone->setAndGet(function ($v) { return $v+1; }) == sizeof($urls)) {
376-
uiLater(function () {
377-
if ($this->_failedFiles->isEmpty()) {
378-
$this->trigger('successAll');
379-
}
380-
});
377+
if (!$this->_break) {
378+
uiLater(function () {
379+
if ($this->_failedFiles->isEmpty()) {
380+
$this->trigger('successAll');
381+
}
382+
});
383+
} else {
384+
// ...
385+
}
381386

382387
uiLater(function () {
383388
$this->trigger('done');
@@ -413,6 +418,14 @@ public function isBusy()
413418
return $this->_busy;
414419
}
415420

421+
/**
422+
* @return bool
423+
*/
424+
public function isBreak()
425+
{
426+
return $this->_break;
427+
}
428+
416429
/**
417430
* @param string $url
418431
* @return mixed
Binary file not shown.
Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
<element extends="ide\scripts\elements\AbstractComponent">
2-
<init>
3-
<property code="inputNode" value="textField" />
4-
<property code="actionNode" value="button" />
5-
</init>
6-
7-
<properties group="binding" title="Взаимодействие">
8-
<property code="inputNode" name="[Вывод]" editor="object" tooltip="ID компонентов, в которые будет выведен результат" />
9-
<property code="actionNode" name="[Действие]" editor="object" tooltip="ID компонентов, при взаимодействии с которыми, будет открываться диалог" />
10-
</properties>
11-
12-
<eventTypes>
13-
<eventType code="action" name="Действие" kind="ObjectEvent" icon="icons/ok16.png" />
14-
<eventType code="cancel" name="Отмена диалога" kind="ObjectEvent" icon="icons/exit16.png" />
15-
</eventTypes>
1+
<element extends="ide\scripts\elements\AbstractComponent">
2+
<init>
3+
<property code="inputNode" value="" />
4+
<property code="actionNode" value="" />
5+
</init>
6+
7+
<properties group="binding" title="Взаимодействие">
8+
<property code="inputNode" name="[Вывод]" editor="object" tooltip="ID компонентов, в которые будет выведен результат" />
9+
<property code="actionNode" name="[Действие]" editor="object" tooltip="ID компонентов, при взаимодействии с которыми, будет открываться диалог" />
10+
</properties>
11+
12+
<eventTypes>
13+
<eventType code="action" name="Действие" kind="ObjectEvent" icon="icons/ok16.png" />
14+
<eventType code="cancel" name="Отмена диалога" kind="ObjectEvent" icon="icons/exit16.png" />
15+
</eventTypes>
1616
</element>

develnext/windowsSetup/innosetup.iss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
33

44
#define MyAppName "DevelNext"
5-
#define MyAppVersion "2016 beta-4"
5+
#define MyAppVersion "2016 beta-5"
66
#define MyAppPublisher "develnext.org"
77
#define MyAppURL "http://develnext.org"
88
#define MyAppExeName "DevelNext.exe"

jphp-app-framework/src/script/support/ScriptHelpers.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@ trait ScriptHelpers
1414
*/
1515
protected function _fetchHelpers($input)
1616
{
17+
if (!$input) {
18+
return [];
19+
}
20+
1721
if ($input instanceof UXNode) {
1822
return [$input];
1923
} else if (is_array($input) && Items::first($input) instanceof UXNode) {

0 commit comments

Comments
 (0)