From 18481d44f39b042933398877d4a2292016dedaad Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Mon, 21 Jan 2019 11:56:41 +0800 Subject: [PATCH] sync --- buildSDK/pre-commit | 12 ++++++++++-- docs/src/Roo_ContentPanel.js.html | 1 - 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/buildSDK/pre-commit b/buildSDK/pre-commit index 3d9d1c99d5..054d4a3774 100755 --- a/buildSDK/pre-commit +++ b/buildSDK/pre-commit @@ -66,16 +66,24 @@ function changed_files() function trigger_action_file($fn, $filename) { $ret = explode("\n",file_get_contents(__DIR__ . "/" . $filename)); + $add = array(); + foreach($ret as $r) { + $r=trim($r); + if (strlen($r)) { + $add[] = str_replace('.','/', $r) . ".js"; + } + } $ret[] = "buildSDK/".$filename; - return trigger_action($fn, $ret); + return trigger_action($fn, $add); } function trigger_action($fn, $files) { - $changed = changed_files(); + foreach(changed_files() as $cg) { foreach($files as $f) { + $f = trim($f); if ($f == $cg) { echo "RUNNING : $fn\n"; $fn(); diff --git a/docs/src/Roo_ContentPanel.js.html b/docs/src/Roo_ContentPanel.js.html index 9eb1276894..c6d686db08 100644 --- a/docs/src/Roo_ContentPanel.js.html +++ b/docs/src/Roo_ContentPanel.js.html @@ -132,7 +132,6 @@ "render" : true - }); -- 2.39.2