nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'next-minor' into develop

Browse source
This commit is contained in:
Steffen van Bergerem 2017-03-06 21:10:31 +01:00
commit 0aefc76aaa
No known key found for this signature in database
GPG key ID: 315C9787D548DC6B
2 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -17,6 +17,7 @@
# 0.6.5.0 # 0.6.5.0
## Refactor ## Refactor
* Remove unused setPreload function [#7354](https://github.com/diaspora/diaspora/pull/7354)
## Bug fixes ## Bug fixes

5
app/assets/javascripts/app/app.js
View file

@ -60,11 +60,6 @@ var app = {
return !!(window.gon.preloads && window.gon.preloads[prop]); //returning boolean variable so that parsePreloads, which cleans up properly is used instead return !!(window.gon.preloads && window.gon.preloads[prop]); //returning boolean variable so that parsePreloads, which cleans up properly is used instead
}, },
setPreload : function(prop, val) {
window.gon.preloads = window.gon.preloads || {};
window.gon.preloads[prop] = val;
},
parsePreload : function(prop) { parsePreload : function(prop) {
if(!app.hasPreload(prop)) { return; } if(!app.hasPreload(prop)) { return; }