Skip to content

Commit

Permalink
Merge pull request #74 from dahabi/master
Browse files Browse the repository at this point in the history
Fix UI Issues
  • Loading branch information
abuturla authored Jun 26, 2018
2 parents 87718b2 + 9928141 commit 4e972b3
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 26 deletions.
2 changes: 1 addition & 1 deletion control/content/templates/home.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ <h4 class="text-center" style="font-size:16px; line-height:22px;">Looks like you
<hr class="none">
</div>
<div ng-if="ContentHome.socialAppId" ng-style="{'height': ContentHome.height ? ContentHome.height-100+ 'px' : '800px'}"
style="overflow-y:scroll;" class="infinite-scroll-parent">
style="overflow-y:auto;" class="infinite-scroll-parent">
<div class="wrapper social-plugin" infinite-scroll-distance="0"
data-infinite-container=".infinite-scroll-parent"
infinite-scroll="ContentHome.startLoadingPosts && ContentHome.getPosts()"
Expand Down
44 changes: 21 additions & 23 deletions plugin.json
Original file line number Diff line number Diff line change
@@ -1,25 +1,23 @@
{
"author": "BuildFire",
"pluginName": "Social Wall",
"pluginDescription": "Keep your users engaged and communicating in your app with social walls. When users perform an interactive action (i.e. liking, commenting), other users in that group will even get an automated SMARTPush™ notification.Related Topics: Bible",
"supportEmail": "[email protected]",
"supportSite": "http://learn.appdocumentation.com/plugin-tutorials/social-wall-plugin-tutorial",
"pluginIcon": "icon.png",
"control": {
"content": {
"enabled": true
},
"design": {
"enabled": false
},
"settings": {
"enabled": false
}
},
"widget": {
},
"features": [],
"languages": [
"en"
]
"author":"BuildFire"
,"pluginName":"Social Wall"
,"pluginDescription":"Keep your users engaged and communicating in your app with social walls. When users perform an interactive action (i.e. liking, commenting), other users in that group will even get an automated SMARTPush™ notification.Related Topics: Bible"
,"supportEmail":"[email protected]"
,"supportSite":"http://learn.appdocumentation.com/plugin-tutorials/social-wall-plugin-tutorial"
,"pluginIcon": "icon.png"
,"control":{
"content":{
"enabled":true
}
, "design":{
"enabled":false
}
, "settings":{
"enabled":false
}
}
,"widget":{
},
"features" : [],
"languages" : ["en"]
}
3 changes: 2 additions & 1 deletion widget/app.service.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@
if (!isiPhone && !isAndroid) {
useHttps = true;
}

if(window &&window.location&&window.location.protocol&& window.location.protocol.startsWith("https"))
useHttps = true;
console.warn('userAgent: ' + userAgent);
console.warn('useHttps: ' + useHttps);

Expand Down
2 changes: 1 addition & 1 deletion widget/enums.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
(function (angular) {
angular.module('socialPluginWidget')
.constant('SERVER_URL', {
link: 'http://social.kaleoapps.com/src/server.js',
link: 'http://social.buildfire.com/src/server.js',
secureLink: 'https://social.buildfire.com/src/server.js'
})
.constant('MORE_MENU_POPUP', {
Expand Down

0 comments on commit 4e972b3

Please sign in to comment.