pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'fix/wrongJsReference' into devel

Browse source 
Conflicts:
	src/octoprint/static/js/app/dataupdater.js
This commit is contained in:
Gina Häußge 2015-11-27 11:32:41 +01:00
commit 8eab664a34
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/octoprint/static/js/app/dataupdater.js
View file

@ -201,7 +201,6 @@ function DataUpdater(allViewModels) {
text: _.sprintf(gettext("Streamed %(local)s to %(remote)s on SD, took %(time).2f seconds"), payload),
type: "success"
});
gcodeFilesViewModel.requestData(payload.remote, "sdcard");
}
var legacyEventHandlers = {

4
src/octoprint/static/js/app/viewmodels/files.js
View file

@ -676,6 +676,10 @@ $(function() {
self.onEventMetadataStatisticsUpdated = function(payload) {
self.requestData(undefined, undefined, self.currentPath());
};
self.onEventTransferDone = function(payload) {
self.requestData(payload.remote, "sdcard");
};
}
OCTOPRINT_VIEWMODELS.push([