Skip to content

Commit 1b5b85c

Browse files
LeanKhanalbertnahasCavdy
authored
Edge to Master v4.8.1 (#5)
* increase version to 4.7.11 * Revert "revert styles from CDN" This reverts commit 6f364e0. * Hide preloader from shrotpoint styles * Increase version to 4.7.12 * update style version * load styles after sap is fully loaded * change sap version * upgrade to version 4.7.13 * SPX-5911 Fix Social Elements not showing in SAP * increase version to 4.8.0 * remove console.log * increase version number to 4.8.1 Co-authored-by: albertnahas <[email protected]> Co-authored-by: Cavdy <[email protected]>
1 parent ef9c1cc commit 1b5b85c

17 files changed

+462
-138
lines changed

webapp/Component.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

webapp/config.js

Lines changed: 110 additions & 110 deletions
Original file line numberDiff line numberDiff line change
@@ -1,110 +1,110 @@
1-
(function() {
2-
var version = "4.7.11";
3-
var sNamespace = "shortpoint-widget-beta";
4-
5-
var versionBuster = version.replace(/\./g, "00");
6-
var prefix = jQuery.sap.getModulePath( sNamespace );
7-
if (prefix === ".") {
8-
prefix = "";
9-
}
10-
11-
var webapp = "";
12-
if(!sap.ushell || !sap.ushell.Container){
13-
// required only in Web IDE testing
14-
webapp = "webapp";
15-
}
16-
17-
// Placeholder for SharePoint _spPageContextInfo object with default values so our build won't fail on SAP
18-
window._spPageContextInfo = {
19-
"webServerRelativeUrl": "/",
20-
"webAbsoluteUrl": location.origin,
21-
"siteAbsoluteUrl": location.origin,
22-
"serverRequestPath": "",
23-
"layoutsUrl": "",
24-
"webTitle": "",
25-
"webTemplate": "",
26-
"tenantAppVersion": "",
27-
"isAppWeb": false,
28-
"webLogoUrl": "",
29-
"webLanguage": 0,
30-
"currentLanguage": 0,
31-
"currentUICultureName": "en-US",
32-
"currentCultureName": "en-US",
33-
"clientServerTimeDelta": 0,
34-
"siteClientTag": "",
35-
"crossDomainPhotosEnabled": false,
36-
"webUIVersion": 0,
37-
"webPermMasks": {
38-
"High": 0,
39-
"Low": 0
40-
},
41-
"pageListId": "",
42-
"pageItemId": 0,
43-
"pagePersonalizationScope": 0,
44-
"userId": 0,
45-
"systemUserKey": "",
46-
"alertsEnabled": false,
47-
"siteServerRelativeUrl": "/",
48-
"allowSilverlightPrompt": ""
49-
};
50-
51-
var root = prefix + "/~" + versionBuster + "~/" + webapp;
52-
jQuery.sap.registerModulePath("shortpoint-root", root);
53-
jQuery.sap.registerModulePath("shortpoint-libs", "https://d2zzvnmppezkx.cloudfront.net/sap/4.7.11" + "/libs");
54-
55-
sap.ui.define(["./connections"], function (connections) {
56-
"use strict";
57-
58-
// map connections
59-
var oConnectionTypes = connections.map(function (item) {
60-
return {
61-
name: item.name,
62-
adapter: "rest",
63-
data: { url: prefix + item.url },
64-
id: item.id
65-
};
66-
});
67-
68-
// add rest api connection
69-
oConnectionTypes.push({
70-
name: 'REST API',
71-
adapter: 'rest',
72-
id: 'dynamic_rest',
73-
data: {
74-
url: '',
75-
editableUrl: true
76-
}
77-
}, {
78-
name: 'RSS Feeds',
79-
adapter: 'rss',
80-
id: 'dynamic_rss',
81-
data: {
82-
url: '',
83-
editableUrl: true
84-
}
85-
});
86-
87-
/**
88-
* ShortPoint configuration
89-
*/
90-
var oShortpointPreConfig = {
91-
autoInit: false,
92-
scrollWrapperSelector: ".shortpoint-scroll-container",
93-
platform: "sap",
94-
version: version,
95-
connectionTypes: oConnectionTypes,
96-
rerenderOnThemeChange: false,
97-
};
98-
99-
window.shortpoint_pre_config = oShortpointPreConfig; // eslint-disable-line camelcase
100-
101-
/**
102-
* expose all configurations
103-
*/
104-
return {
105-
namespace: sNamespace,
106-
shortpointPreConfig: oShortpointPreConfig,
107-
appVersion: version
108-
};
109-
});
110-
})();
1+
(function() {
2+
var version = "4.8.1";
3+
var sNamespace = "shortpoint-widget-beta";
4+
5+
var versionBuster = version.replace(/\./g, "00");
6+
var prefix = jQuery.sap.getModulePath( sNamespace );
7+
if (prefix === ".") {
8+
prefix = "";
9+
}
10+
11+
var webapp = "";
12+
if(!sap.ushell || !sap.ushell.Container){
13+
// required only in Web IDE testing
14+
webapp = "webapp";
15+
}
16+
17+
// Placeholder for SharePoint _spPageContextInfo object with default values so our build won't fail on SAP
18+
window._spPageContextInfo = {
19+
"webServerRelativeUrl": "/",
20+
"webAbsoluteUrl": location.origin,
21+
"siteAbsoluteUrl": location.origin,
22+
"serverRequestPath": "",
23+
"layoutsUrl": "",
24+
"webTitle": "",
25+
"webTemplate": "",
26+
"tenantAppVersion": "",
27+
"isAppWeb": false,
28+
"webLogoUrl": "",
29+
"webLanguage": 0,
30+
"currentLanguage": 0,
31+
"currentUICultureName": "en-US",
32+
"currentCultureName": "en-US",
33+
"clientServerTimeDelta": 0,
34+
"siteClientTag": "",
35+
"crossDomainPhotosEnabled": false,
36+
"webUIVersion": 0,
37+
"webPermMasks": {
38+
"High": 0,
39+
"Low": 0
40+
},
41+
"pageListId": "",
42+
"pageItemId": 0,
43+
"pagePersonalizationScope": 0,
44+
"userId": 0,
45+
"systemUserKey": "",
46+
"alertsEnabled": false,
47+
"siteServerRelativeUrl": "/",
48+
"allowSilverlightPrompt": ""
49+
};
50+
51+
var root = prefix + "/~" + versionBuster + "~/" + webapp;
52+
jQuery.sap.registerModulePath("shortpoint-root", root);
53+
jQuery.sap.registerModulePath("shortpoint-libs", "https://d2zzvnmppezkx.cloudfront.net/sap/4.8.1" + "/libs");
54+
55+
sap.ui.define(["./connections"], function (connections) {
56+
"use strict";
57+
58+
// map connections
59+
var oConnectionTypes = connections.map(function (item) {
60+
return {
61+
name: item.name,
62+
adapter: "rest",
63+
data: { url: prefix + item.url },
64+
id: item.id
65+
};
66+
});
67+
68+
// add rest api connection
69+
oConnectionTypes.push({
70+
name: 'REST API',
71+
adapter: 'rest',
72+
id: 'dynamic_rest',
73+
data: {
74+
url: '',
75+
editableUrl: true
76+
}
77+
}, {
78+
name: 'RSS Feeds',
79+
adapter: 'rss',
80+
id: 'dynamic_rss',
81+
data: {
82+
url: '',
83+
editableUrl: true
84+
}
85+
});
86+
87+
/**
88+
* ShortPoint configuration
89+
*/
90+
var oShortpointPreConfig = {
91+
autoInit: false,
92+
scrollWrapperSelector: ".shortpoint-scroll-container",
93+
platform: "sap",
94+
version: version,
95+
connectionTypes: oConnectionTypes,
96+
rerenderOnThemeChange: false,
97+
};
98+
99+
window.shortpoint_pre_config = oShortpointPreConfig; // eslint-disable-line camelcase
100+
101+
/**
102+
* expose all configurations
103+
*/
104+
return {
105+
namespace: sNamespace,
106+
shortpointPreConfig: oShortpointPreConfig,
107+
appVersion: version
108+
};
109+
});
110+
})();

webapp/css/style.css

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -319,8 +319,7 @@
319319

320320
/* Support 5500 */
321321
/* Hide preloaders until we figure out what is causing them to sometimes not go away */
322-
.shortpoint-sk-root, .shortpoint-sk-wrap, .shrotpoint-sk-circle {
323-
display: none !important;
324-
}
325-
322+
.shortpoint-sk-root {
323+
display: none !important;
324+
}
326325

0 commit comments

Comments
 (0)