Skip to content

Commit 6086fe0

Browse files
committed
Merge pull request #613 from harsha89/release-2.0.0
fixing bar color issue
2 parents 272efef + 47d0886 commit 6086fe0

File tree

2 files changed

+27
-4
lines changed
  • features/apimgt
    • org.wso2.carbon.apimgt.core.feature/src/main/resources/repository/database
    • org.wso2.carbon.apimgt.publisher.feature/src/main/resources/extensions/publisher/assets/api/themes/default/helpers

2 files changed

+27
-4
lines changed

features/apimgt/org.wso2.carbon.apimgt.publisher.feature/src/main/resources/extensions/publisher/assets/api/themes/default/helpers/header.js

+27-4
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,31 @@
1717
*
1818
*/
1919

20-
var resources = function(){
21-
return {
22-
css:['apim_common.css']
20+
/*
21+
* Changed the logic of this js after ES properly given the option to inherit css
22+
*/
23+
var name;
24+
var parentHelper = new File('/extensions/app/greg-publisher-defaults/themes/default/helpers/header.js');
25+
26+
if(parentHelper.isExists()){
27+
var hps = require('/extensions/app/greg-publisher-defaults/themes/default/helpers/header.js');
28+
var that = this;
29+
/*
30+
In order to inherit all variables in the default helper
31+
*/
32+
for (name in hps) {
33+
if (hps.hasOwnProperty(name)) {
34+
that[name] = hps[name];
35+
}
36+
}
37+
var fn = that.resources;
38+
}
39+
40+
var resources = function(page, meta) {
41+
var o = fn ? fn(page, meta) : {};
42+
if (!o.css) {
43+
o.css = [];
2344
}
24-
};
45+
o.css.push('apim_common.css');
46+
return o;
47+
};

0 commit comments

Comments
 (0)