IT4Change/ohmyform
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed production bug

Browse Source
This commit is contained in:
David Baldwynn 2017-09-20 22:51:42 -04:00
parent 86228ed7dc
commit 7512402c08
10 changed files with 127 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/views/layout.server.view.html
View File

@ -72,7 +72,10 @@
<!--Embedding The signupDisabled Boolean-->
<script type="text/javascript">
var signupDisabled = {{signupDisabled | safe}};
var socketPort = {{socketPort | safe}} || false;
var socketPort = false;
{% if socketPort %}
socketPort = {{socketPort | safe}};
{% endif %}
var socketUrl = "{{socketUrl | safe}}" || false;
var subdomainsDisabled = {{subdomainsDisabled | safe}};
</script>

140
public/dist/application.js vendored
View File

File diff suppressed because one or more lines are too long

10
public/dist/application.min.js vendored
View File

File diff suppressed because one or more lines are too long

14
public/dist/form-application.js vendored
View File

@ -1057,14 +1057,14 @@ angular.module('view-form').factory('Forms', ['$resource', 'VIEW_FORM_URL',
socket: null
};
console.log($window.socketUrl);
console.log(window.socketUrl);
var url = '';
if($window.socketUrl && $window.socketPort){
url = window.location.protocol + '//' + $window.socketUrl + ':' + $window.socketPort;
} else if ($window.socketUrl){
url = window.location.protocol + '//' + $window.socketUrl;
} else if ($window.socketPort){
url = window.location.protocol + '//' + window.location.hostname + ':' + $window.socketPort;
if(window.socketUrl && window.socketPort){
url = window.location.protocol + '//' + window.socketUrl + ':' + window.socketPort;
} else if (window.socketUrl){
url = window.location.protocol + '//' + window.socketUrl;
} else if (window.socketPort){
url = window.location.protocol + '//' + window.location.hostname + ':' + window.socketPort;
} else {
url = window.location.protocol + '//' + window.location.hostname;
}

2
public/dist/form-application.min.js vendored
View File

File diff suppressed because one or more lines are too long

18
public/dist/form_populate_template_cache.js vendored
View File

File diff suppressed because one or more lines are too long

32
public/dist/vendor.min.js vendored
View File

File diff suppressed because one or more lines are too long

30
public/dist/vendor_forms_uglified.js vendored
View File

File diff suppressed because one or more lines are too long

14
public/form_modules/forms/base/services/socket.io.client.service.js
View File

@ -44,14 +44,14 @@
socket: null
};
console.log($window.socketUrl);
console.log(window.socketUrl);
var url = '';
if($window.socketUrl && $window.socketPort){
url = window.location.protocol + '//' + $window.socketUrl + ':' + $window.socketPort;
} else if ($window.socketUrl){
url = window.location.protocol + '//' + $window.socketUrl;
} else if ($window.socketPort){
url = window.location.protocol + '//' + window.location.hostname + ':' + $window.socketPort;
if(window.socketUrl && window.socketPort){
url = window.location.protocol + '//' + window.socketUrl + ':' + window.socketPort;
} else if (window.socketUrl){
url = window.location.protocol + '//' + window.socketUrl;
} else if (window.socketPort){
url = window.location.protocol + '//' + window.location.hostname + ':' + window.socketPort;
} else {
url = window.location.protocol + '//' + window.location.hostname;
}

1
public/modules/forms/config/forms.client.config.js
View File

@ -38,7 +38,6 @@ angular.module('forms').run(['Menus',
};
}]).filter('trustSrc', ['$sce', function($sce){
return function(formUrl){
(' $sce.trustAsResourceUrl(formUrl): '+ $sce.trustAsResourceUrl(formUrl));
return $sce.trustAsResourceUrl(formUrl);
};
}]).config(['$provide', function ($provide){