|
@@ -71,13 +71,13 @@ discard block |
|
|
block discarded – undo |
|
71
|
71
|
} elseif ($this->appendIfExist($this->serverroot, $theme_dir.'apps/'.$script.'.js') |
|
72
|
72
|
|| $this->appendIfExist($this->serverroot, $theme_dir.$script.'.js') |
|
73
|
73
|
|| $this->appendIfExist($this->serverroot, $script.'.js') |
|
74
|
|
- || $this->appendIfExist($this->serverroot, $theme_dir . "dist/$app-$scriptName.js") |
|
|
74
|
+ || $this->appendIfExist($this->serverroot, $theme_dir."dist/$app-$scriptName.js") |
|
75
|
75
|
|| $this->appendIfExist($this->serverroot, "dist/$app-$scriptName.js") |
|
76
|
76
|
|| $this->appendIfExist($this->serverroot, 'apps/'.$script.'.js') |
|
77
|
77
|
|| $this->cacheAndAppendCombineJsonIfExist($this->serverroot, $script.'.json') |
|
78
|
78
|
|| $this->appendIfExist($this->serverroot, $theme_dir.'core/'.$script.'.js') |
|
79
|
79
|
|| $this->appendIfExist($this->serverroot, 'core/'.$script.'.js') |
|
80
|
|
- || (strpos($scriptName, '/') === -1 && ($this->appendIfExist($this->serverroot, $theme_dir . "dist/core-$scriptName.js") |
|
|
80
|
+ || (strpos($scriptName, '/') === -1 && ($this->appendIfExist($this->serverroot, $theme_dir."dist/core-$scriptName.js") |
|
81
|
81
|
|| $this->appendIfExist($this->serverroot, "dist/core-$scriptName.js"))) |
|
82
|
82
|
|| $this->cacheAndAppendCombineJsonIfExist($this->serverroot, 'core/'.$script.'.json') |
|
83
|
83
|
) { |
|
@@ -97,20 +97,20 @@ discard block |
|
|
block discarded – undo |
|
97
|
97
|
|
|
98
|
98
|
// missing translations files fill be ignored |
|
99
|
99
|
if (strpos($script, 'l10n/') === 0) { |
|
100
|
|
- $this->appendIfExist($app_path, $script . '.js', $app_url); |
|
|
100
|
+ $this->appendIfExist($app_path, $script.'.js', $app_url); |
|
101
|
101
|
return; |
|
102
|
102
|
} |
|
103
|
103
|
|
|
104
|
104
|
if ($app_path === false && $app_url === false) { |
|
105
|
105
|
$this->logger->error('Could not find resource {resource} to load', [ |
|
106
|
|
- 'resource' => $app . '/' . $script . '.js', |
|
|
106
|
+ 'resource' => $app.'/'.$script.'.js', |
|
107
|
107
|
'app' => 'jsresourceloader', |
|
108
|
108
|
]); |
|
109
|
109
|
return; |
|
110
|
110
|
} |
|
111
|
111
|
|
|
112
|
112
|
if (!$this->cacheAndAppendCombineJsonIfExist($app_path, $script.'.json', $app)) { |
|
113
|
|
- $this->append($app_path, $script . '.js', $app_url); |
|
|
113
|
+ $this->append($app_path, $script.'.js', $app_url); |
|
114
|
114
|
} |
|
115
|
115
|
} |
|
116
|
116
|
|
nextcloud /
server
