Merge "Always set mode when activating the target"

This commit is contained in:
jenkins-bot 2016-11-15 16:07:50 +00:00 committed by Gerrit Code Review
commit 019aee30d4

View file

@ -286,6 +286,8 @@
// Detach the loading bar for activation so it doesn't get moved around
// and altered, re-attach immediately after
init.$loading.detach();
// If target was already loaded, ensure the mode is correct
target.setMode( mode );
activatePromise = target.activate( dataPromise );
$( '#content' ).prepend( init.$loading );
return activatePromise;