mirror/piskel
1
0
Fork 0
mirror of https://github.com/piskelapp/piskel.git synced 2023-08-10 21:12:52 +03:00
Code Issues Projects Releases Wiki Activity

Issue #745 - Add https support

Browse Source
This commit is contained in:
Julian Descottes 2017-09-24 14:58:31 +02:00
parent d1156954ca
commit d502d3416b
4 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/js/Constants.js
View File

@ -63,6 +63,6 @@ var Constants = {
// SERVICE URLS // SERVICE URLS
APPENGINE_SAVE_URL : 'save', APPENGINE_SAVE_URL : 'save',
IMAGE_SERVICE_UPLOAD_URL : 'http://piskel-imgstore-b.appspot.com/__/upload', IMAGE_SERVICE_UPLOAD_URL : '{{protocol}}://piskel-imgstore-b.appspot.com/__/upload',
IMAGE_SERVICE_GET_URL : 'http://piskel-imgstore-b.appspot.com/img/' IMAGE_SERVICE_GET_URL : '{{protocol}}://piskel-imgstore-b.appspot.com/img/'
}; };

11
src/js/service/ImageUploadService.js
View File

@ -15,10 +15,17 @@
data : imageData data : imageData
}; };
var protocol = pskl.utils.Environment.isHttps() ? 'https' : 'http';
var wrappedSuccess = function (response) { var wrappedSuccess = function (response) {
success(Constants.IMAGE_SERVICE_GET_URL + response.responseText); var getUrl = pskl.utils.Template.replace(Constants.IMAGE_SERVICE_GET_URL, {
protocol: protocol
});
success(getUrl + response.responseText);
}; };
pskl.utils.Xhr.post(Constants.IMAGE_SERVICE_UPLOAD_URL, data, wrappedSuccess, error); var uploadUrl = pskl.utils.Template.replace(Constants.IMAGE_SERVICE_UPLOAD_URL, {
protocol: protocol
});
pskl.utils.Xhr.post(uploadUrl, data, wrappedSuccess, error);
}; };
})(); })();

6
src/js/utils/Environment.js
View File

@ -27,7 +27,11 @@
isDebug : function () { isDebug : function () {
return window.location.href.indexOf('debug') !== -1; return window.location.href.indexOf('debug') !== -1;
} },
isHttps : function () {
return window.location.href.indexOf('https://') === 0;
},
}; };
})(); })();

2
src/templates/settings/save.html
View File

@ -39,7 +39,7 @@
<script type="text/template" id="save-gallery-unavailable-partial"> <script type="text/template" id="save-gallery-unavailable-partial">
<div class="settings-title">Save online</div> <div class="settings-title">Save online</div>
<div class="settings-item"> <div class="settings-item">
<div class="save-status">Login to <a href="http://piskelapp.com" target="_blank">piskelapp.com</a> to save and share your sprites online.</div> <div class="save-status">Login to <a href="https://www.piskelapp.com" target="_blank">piskelapp.com</a> to save and share your sprites online.</div>
</div> </div>
</script> </script>