Client build, webpack: move app-webpack closer to app-base for replacement/inheritance, fix bootstrapping of configuration and use managers

This commit is contained in:
Carl Eberhard
2015-07-17 12:21:44 -04:00
parent 0c03f69c39
commit 25770f4c7c
9 changed files with 65 additions and 39 deletions
+1 -6
View File
@@ -53,13 +53,8 @@ GalaxyApp.prototype._init = function init( options ){
self._initUser( options.user || bootstrapped.user || {} );
self.debug( 'GalaxyApp.user: ', self.user );
//TODO: temp
self.trigger( 'ready', self );
//if( typeof options.onload === 'function' ){
// options.onload();
//}
self._setUpListeners();
self.trigger( 'ready', self );
return self;
};
+44 -16
View File
@@ -24,6 +24,15 @@ function GalaxyApp( options, bootstrapped ){
// add logging shortcuts for this object
addLogging( GalaxyApp, 'GalaxyApp' );
/** default options */
GalaxyApp.prototype.defaultOptions = {
/** monkey patch attributes from existing window.Galaxy object? */
patchExisting : true,
/** root url of this app */
// move to self.root?
root : '/'
};
/** initalize options and sub-components */
GalaxyApp.prototype._init = function init( options, bootstrapped ){
var self = this;
@@ -42,28 +51,16 @@ GalaxyApp.prototype._init = function init( options, bootstrapped ){
self._initLocale();
self.debug( 'GalaxyApp.localize: ', self.localize );
self.config = bootstrapped.config || {};
self.config = options.config || bootstrapped.config || {};
self.debug( 'GalaxyApp.config: ', self.config );
self._initUser( bootstrapped.user || {} );
self._initUser( options.user || bootstrapped.user || {} );
self.debug( 'GalaxyApp.user: ', self.user );
//TODO: temp
if( typeof options.onload === 'function' ){
options.onload();
}
self._setUpListeners();
return self;
};
self.trigger( 'ready', self );
/** default options */
GalaxyApp.prototype.defaultOptions = {
/** monkey patch attributes from existing window.Galaxy object? */
patchExisting : true,
/** root url of this app */
// move to self.root?
root : '/'
return self;
};
/** add an option from options if the key matches an option in defaultOptions */
@@ -145,7 +142,38 @@ GalaxyApp.prototype._setUpListeners = function _setUpListeners(){
};
//TODO:?? we might somehow manage to *retry* ajax using either this hook or Backbone.sync
});
self._listenToGalaxyMain();
return self;
};
/** trigger an event when the main frame loads a new page */
GalaxyApp.prototype._listenToGalaxyMain = function _listenToGalaxyMain(){
var self = this,
selector = 'iframe#galaxy_main',
galaxy_main = $( selector );
galaxy_main = galaxy_main.size()? galaxy_main.get( 0 ).contentWindow : undefined ;
if( galaxy_main ){
// TODO: this would be better external to this function so it can be removed
var handler = function __galaxyMainOnLoadHandler( ev ){
try {
var _galaxy_main = $( selector ).get( 0 ).contentWindow,
full = _galaxy_main.location.pathname + _galaxy_main.location.search + _galaxy_main.location.hash;
self.trigger( 'galaxy_main:load', {
fullpath: full,
pathname: _galaxy_main.location.pathname,
search : _galaxy_main.location.search,
hash : _galaxy_main.location.hash
});
} catch( err ){
self.debug( 'Error handling main frame load:', err );
}
};
$( selector ).on( 'load', handler );
} else {
self.debug( 'No galaxy_main found' );
}
};
/** string rep */
+1 -1
View File
@@ -60,7 +60,7 @@ class ConfigSerializer( base.ModelSerializer ):
'allow_user_dataset_purge' : _defaults_to( False ),
'enable_unique_workflow_defaults' : _defaults_to( False ),
'nginx_upload_path' : _defaults_to( self.url_for( controller='api', action='tools' ) ),
'nginx_upload_path' : _defaults_to( False ),
'ftp_upload_dir' : _defaults_to( None ),
'ftp_upload_site' : _defaults_to( None ),
'version_major' : _defaults_to( None ),
+8 -5
View File
@@ -41,6 +41,7 @@ from galaxy.managers import tags
from galaxy.managers import workflows
from galaxy.managers import base as managers_base
from galaxy.managers import users
from galaxy.managers import configuration
from galaxy.datatypes.metadata import FileParameter
from galaxy.tools.parameters import visit_input_values
from galaxy.tools.parameters.basic import DataToolParameter
@@ -257,7 +258,10 @@ class JSAppLauncher( BaseUIController ):
def __init__( self, app ):
super( JSAppLauncher, self ).__init__( app )
self.user_manager = users.UserManager( app )
self.user_serializer = users.CurrentUserSerializer( app )
self.config_serializer = configuration.ConfigSerializer( app )
self.admin_config_serializer = configuration.AdminConfigSerializer( app )
def _js_options( self, trans, **kwargs ):
"""
@@ -277,11 +281,10 @@ class JSAppLauncher( BaseUIController ):
Return a dictionary representing Galaxy's current configuration.
"""
try:
config_dict = {}
config_controller = trans.webapp.api_controllers.get( 'configuration', None )
if config_controller:
config_dict = config_controller.get_config_dict( trans.app.config, trans.user_is_admin() )
return config_dict
serializer = self.config_serializer
if self.user_manager.is_admin( trans.user ):
serializer = self.admin_config_serializer
return serializer.serialize_to_view( self.app.config, view='all' )
except Exception, exc:
log.exception( exc )
return {}
+1 -1
View File
@@ -1 +1 @@
{"version":3,"file":"galaxy-app-base.js","sources":["../src/galaxy-app-base.js"],"names":["define","userModel","metricsLogger","addLogging","localize","bootstrapped","GalaxyApp","options","self","this","_init","prototype","defaultOptions","patchExisting","root","_","extend","Backbone","Events","_processOptions","debug","_patchGalaxy","window","Galaxy","_initLogger","loggerOptions","logger","_initLocale","config","_initUser","user","trigger","_setUpListeners","defaults","k","hasOwnProperty","patchWith","MetricsLogger","_l","userJSON","User","currUser","lastAjax","$","document","bind","ev","xhr","data","JSON","parse","err","url","location","href","slice","_listenToGalaxyMain","selector","galaxy_main","size","get","contentWindow","undefined","handler","_galaxy_main","full","pathname","search","hash","fullpath","on","toString","userEmail"],"mappings":"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"}
{"version":3,"file":"galaxy-app-base.js","sources":["../src/galaxy-app-base.js"],"names":["define","userModel","metricsLogger","addLogging","localize","bootstrapped","GalaxyApp","options","self","this","_init","prototype","defaultOptions","patchExisting","root","_","extend","Backbone","Events","_processOptions","debug","_patchGalaxy","window","Galaxy","_initLogger","loggerOptions","logger","_initLocale","config","_initUser","user","_setUpListeners","trigger","defaults","k","hasOwnProperty","patchWith","MetricsLogger","_l","userJSON","User","currUser","lastAjax","$","document","bind","ev","xhr","data","JSON","parse","err","url","location","href","slice","_listenToGalaxyMain","selector","galaxy_main","size","get","contentWindow","undefined","handler","_galaxy_main","full","pathname","search","hash","fullpath","on","toString","userEmail"],"mappings":"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"}
+1 -1
View File
@@ -1 +1 @@
{"version":3,"file":"galaxy-app-webpack.js","sources":["../src/galaxy-app-webpack.js"],"names":["require","define","userModel","metricsLogger","addLogging","localize","GalaxyApp","options","bootstrapped","self","this","_init","prototype","console","debug","_","extend","Backbone","Events","_processOptions","_patchGalaxy","window","Galaxy","_initLogger","loggerOptions","logger","_initLocale","config","_initUser","user","onload","_setUpListeners","defaultOptions","patchExisting","root","defaults","k","hasOwnProperty","patchWith","MetricsLogger","_l","userJSON","User","currUser","lastAjax","$","document","bind","ev","xhr","data","JSON","parse","err","url","location","href","slice","toString","userEmail","get"],"mappings":"AAEAA,QAAS,sBACTC,QACI,sBACA,uBACA,oBACA,sBACD,SAAUC,EAAWC,EAAeC,EAAYC,GAUnD,QAASC,GAAWC,EAASC,GACzB,GAAIC,GAAOC,IACX,OAAOD,GAAKE,MAAOJ,MAAeC,OA0IlC,MAtIJJ,GAAYE,EAAW,aAGvBA,EAAUM,UAAUD,MAAQ,SAAeJ,EAASC,GAChD,GAAIC,GAAOC,IA4BX,OA1BAG,SAAQC,MAAO,gBAAiBN,GAChCO,EAAEC,OAAQP,EAAMQ,SAASC,QAEzBT,EAAKU,gBAAiBZ,GACtBE,EAAKK,MAAO,sBAAuBL,EAAKF,SAExCE,EAAKW,aAAcC,OAAOC,QAE1Bb,EAAKc,YAAahB,EAAQiB,mBAC1Bf,EAAKK,MAAO,qBAAsBL,EAAKgB,QAEvChB,EAAKiB,cACLjB,EAAKK,MAAO,uBAAwBL,EAAKJ,UAEzCI,EAAKkB,OAASnB,EAAamB,WAC3BlB,EAAKK,MAAO,qBAAsBL,EAAKkB,QAEvClB,EAAKmB,UAAWpB,EAAaqB,UAC7BpB,EAAKK,MAAO,mBAAoBL,EAAKoB,MAGP,kBAAnBtB,GAAQuB,QACfvB,EAAQuB,SAGZrB,EAAKsB,kBACEtB,GAIXH,EAAUM,UAAUoB,gBAEhBC,eAAkB,EAGlBC,KAAkB,KAItB5B,EAAUM,UAAUO,gBAAkB,SAA0BZ,GAC5D,GAAIE,GAAOC,KACPyB,EAAW1B,EAAKuB,cACpBvB,GAAKK,MAAO,oBAAqBP,GAEjCE,EAAKF,UACL,KAAK,GAAI6B,KAAKD,GACNA,EAASE,eAAgBD,KACzB3B,EAAKF,QAAS6B,GAAQ7B,EAAQ8B,eAAgBD,GAAQ7B,EAAS6B,GAAQD,EAAUC,GAGzF,OAAO3B,IAIXH,EAAUM,UAAUQ,aAAe,SAA0BkB,GACzD,GAAI7B,GAAOC,IAEX,IAAID,EAAKF,QAAQ0B,eAAiBK,EAAW,CACzC7B,EAAKK,MAAO,gCAAiCwB,EAG7C,KAAK,GAAIF,KAAKE,GACNA,EAAUD,eAAgBD,KAC1B3B,EAAKK,MAAO,iBAAoBsB,EAAI,cACpC3B,EAAM2B,GAAME,EAAWF,MAOvC9B,EAAUM,UAAUW,YAAc,SAAsBC,GACpD,GAAIf,GAAOC,IAGX,OAFAD,GAAKK,MAAO,eAAgBU,GAC5Bf,EAAKgB,OAAS,GAAItB,GAAcoC,cAAef,GACxCf,GAIXH,EAAUM,UAAUc,YAAc,SAAsBnB,GACpD,GAAIE,GAAOC,IAKX,OAJAD,GAAKK,MAAO,eAAgBP,GAC5BE,EAAKJ,SAAWA,EAEhBgB,OAAOmB,GAAK/B,EAAKJ,SACVI,GAIXH,EAAUM,UAAUgB,UAAY,SAAoBa,GAChD,GAAIhC,GAAOC,IAKX,OAJAD,GAAKK,MAAO,aAAc2B,GAC1BhC,EAAKoB,KAAO,GAAI3B,GAAUwC,KAAMD,GAEhChC,EAAKkC,SAAWlC,EAAKoB,KACdpB,GAIXH,EAAUM,UAAUmB,gBAAkB,WAClC,GAAItB,GAAOC,IAIXD,GAAKmC,YACLC,EAAGC,UAAWC,KAAM,WAAY,SAAUC,EAAIC,EAAK1C,GAC/C,GAAI2C,GAAO3C,EAAQ2C,IACnB,KACIA,EAAOC,KAAKC,MAAOF,GACrB,MAAOG,IAET5C,EAAKmC,UACDU,IAAUC,SAASC,KAAKC,MAAO,EAAG,IAAOlD,EAAQ+C,IACjDJ,KAAUA,MAQtB5C,EAAUM,UAAU8C,SAAW,WAC3B,GAAIC,GAAYjD,KAAKmB,KAAK+B,IAAK,UAAa,aAC5C,OAAO,aAAeD,EAAY,MAM9BrD,UAAYA"}
{"version":3,"file":"galaxy-app-webpack.js","sources":["../src/galaxy-app-webpack.js"],"names":["require","define","userModel","metricsLogger","addLogging","localize","GalaxyApp","options","bootstrapped","self","this","_init","prototype","defaultOptions","patchExisting","root","console","debug","_","extend","Backbone","Events","_processOptions","_patchGalaxy","window","Galaxy","_initLogger","loggerOptions","logger","_initLocale","config","_initUser","user","_setUpListeners","trigger","defaults","k","hasOwnProperty","patchWith","MetricsLogger","_l","userJSON","User","currUser","lastAjax","$","document","bind","ev","xhr","data","JSON","parse","err","url","location","href","slice","_listenToGalaxyMain","selector","galaxy_main","size","get","contentWindow","undefined","handler","_galaxy_main","full","pathname","search","hash","fullpath","on","toString","userEmail"],"mappings":"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"}
File diff suppressed because one or more lines are too long
+1 -1
View File
@@ -1,2 +1,2 @@
define(["mvc/user/user-model","utils/metrics-logger","utils/add-logging","utils/localization","bootstrapped-data"],function(a,b,c,d,e){function f(a){var b=this;return b._init(a||{})}return c(f,"GalaxyApp"),f.prototype.defaultOptions={patchExisting:!0,root:"/"},f.prototype._init=function(a){var b=this;return _.extend(b,Backbone.Events),b._processOptions(a),b.debug("GalaxyApp.options: ",b.options),b._patchGalaxy(window.Galaxy),b._initLogger(a.loggerOptions||{}),b.debug("GalaxyApp.logger: ",b.logger),b._initLocale(),b.debug("GalaxyApp.localize: ",b.localize),b.config=a.config||e.config||{},b.debug("GalaxyApp.config: ",b.config),b._initUser(a.user||e.user||{}),b.debug("GalaxyApp.user: ",b.user),b.trigger("ready",b),b._setUpListeners(),b},f.prototype._processOptions=function(a){var b=this,c=b.defaultOptions;b.debug("_processOptions: ",a),b.options={};for(var d in c)c.hasOwnProperty(d)&&(b.options[d]=a.hasOwnProperty(d)?a[d]:c[d]);return b},f.prototype._patchGalaxy=function(a){var b=this;if(b.options.patchExisting&&a){b.debug("found existing Galaxy object:",a);for(var c in a)a.hasOwnProperty(c)&&(b.debug(" patching in "+c+" to Galaxy"),b[c]=a[c])}},f.prototype._initLogger=function(a){var c=this;return c.debug("_initLogger:",a),c.logger=new b.MetricsLogger(a),c},f.prototype._initLocale=function(a){var b=this;return b.debug("_initLocale:",a),b.localize=d,window._l=b.localize,b},f.prototype._initUser=function(b){var c=this;return c.debug("_initUser:",b),c.user=new a.User(b),c.currUser=c.user,c},f.prototype._setUpListeners=function(){var a=this;return a.lastAjax={},$(document).bind("ajaxSend",function(b,c,d){var e=d.data;try{e=JSON.parse(e)}catch(f){}a.lastAjax={url:location.href.slice(0,-1)+d.url,data:e}}),a._listenToGalaxyMain(),a},f.prototype._listenToGalaxyMain=function(){var a=this,b="iframe#galaxy_main",c=$(b);if(c=c.size()?c.get(0).contentWindow:void 0){var d=function(){try{var c=$(b).get(0).contentWindow,d=c.location.pathname+c.location.search+c.location.hash;a.trigger("galaxy_main:load",{fullpath:d,pathname:c.location.pathname,search:c.location.search,hash:c.location.hash})}catch(e){a.debug("Error handling main frame load:",e)}};$(b).on("load",d)}else a.debug("No galaxy_main found")},f.prototype.toString=function(){var a=this.user.get("email")||"(anonymous)";return"GalaxyApp("+a+")"},{GalaxyApp:f}});
define(["mvc/user/user-model","utils/metrics-logger","utils/add-logging","utils/localization","bootstrapped-data"],function(a,b,c,d,e){function f(a){var b=this;return b._init(a||{})}return c(f,"GalaxyApp"),f.prototype.defaultOptions={patchExisting:!0,root:"/"},f.prototype._init=function(a){var b=this;return _.extend(b,Backbone.Events),b._processOptions(a),b.debug("GalaxyApp.options: ",b.options),b._patchGalaxy(window.Galaxy),b._initLogger(a.loggerOptions||{}),b.debug("GalaxyApp.logger: ",b.logger),b._initLocale(),b.debug("GalaxyApp.localize: ",b.localize),b.config=a.config||e.config||{},b.debug("GalaxyApp.config: ",b.config),b._initUser(a.user||e.user||{}),b.debug("GalaxyApp.user: ",b.user),b._setUpListeners(),b.trigger("ready",b),b},f.prototype._processOptions=function(a){var b=this,c=b.defaultOptions;b.debug("_processOptions: ",a),b.options={};for(var d in c)c.hasOwnProperty(d)&&(b.options[d]=a.hasOwnProperty(d)?a[d]:c[d]);return b},f.prototype._patchGalaxy=function(a){var b=this;if(b.options.patchExisting&&a){b.debug("found existing Galaxy object:",a);for(var c in a)a.hasOwnProperty(c)&&(b.debug(" patching in "+c+" to Galaxy"),b[c]=a[c])}},f.prototype._initLogger=function(a){var c=this;return c.debug("_initLogger:",a),c.logger=new b.MetricsLogger(a),c},f.prototype._initLocale=function(a){var b=this;return b.debug("_initLocale:",a),b.localize=d,window._l=b.localize,b},f.prototype._initUser=function(b){var c=this;return c.debug("_initUser:",b),c.user=new a.User(b),c.currUser=c.user,c},f.prototype._setUpListeners=function(){var a=this;return a.lastAjax={},$(document).bind("ajaxSend",function(b,c,d){var e=d.data;try{e=JSON.parse(e)}catch(f){}a.lastAjax={url:location.href.slice(0,-1)+d.url,data:e}}),a._listenToGalaxyMain(),a},f.prototype._listenToGalaxyMain=function(){var a=this,b="iframe#galaxy_main",c=$(b);if(c=c.size()?c.get(0).contentWindow:void 0){var d=function(){try{var c=$(b).get(0).contentWindow,d=c.location.pathname+c.location.search+c.location.hash;a.trigger("galaxy_main:load",{fullpath:d,pathname:c.location.pathname,search:c.location.search,hash:c.location.hash})}catch(e){a.debug("Error handling main frame load:",e)}};$(b).on("load",d)}else a.debug("No galaxy_main found")},f.prototype.toString=function(){var a=this.user.get("email")||"(anonymous)";return"GalaxyApp("+a+")"},{GalaxyApp:f}});
//# sourceMappingURL=../maps/galaxy-app-base.js.map
+1 -1
View File
@@ -1,2 +1,2 @@
require("./libs/common-libs"),define(["mvc/user/user-model","utils/metrics-logger","utils/add-logging","utils/localization"],function(a,b,c,d){function e(a,b){var c=this;return c._init(a||{},b||{})}return c(e,"GalaxyApp"),e.prototype._init=function(a,b){var c=this;return console.debug("bootstrapped:",b),_.extend(c,Backbone.Events),c._processOptions(a),c.debug("GalaxyApp.options: ",c.options),c._patchGalaxy(window.Galaxy),c._initLogger(a.loggerOptions||{}),c.debug("GalaxyApp.logger: ",c.logger),c._initLocale(),c.debug("GalaxyApp.localize: ",c.localize),c.config=b.config||{},c.debug("GalaxyApp.config: ",c.config),c._initUser(b.user||{}),c.debug("GalaxyApp.user: ",c.user),"function"==typeof a.onload&&a.onload(),c._setUpListeners(),c},e.prototype.defaultOptions={patchExisting:!0,root:"/"},e.prototype._processOptions=function(a){var b=this,c=b.defaultOptions;b.debug("_processOptions: ",a),b.options={};for(var d in c)c.hasOwnProperty(d)&&(b.options[d]=a.hasOwnProperty(d)?a[d]:c[d]);return b},e.prototype._patchGalaxy=function(a){var b=this;if(b.options.patchExisting&&a){b.debug("found existing Galaxy object:",a);for(var c in a)a.hasOwnProperty(c)&&(b.debug(" patching in "+c+" to Galaxy"),b[c]=a[c])}},e.prototype._initLogger=function(a){var c=this;return c.debug("_initLogger:",a),c.logger=new b.MetricsLogger(a),c},e.prototype._initLocale=function(a){var b=this;return b.debug("_initLocale:",a),b.localize=d,window._l=b.localize,b},e.prototype._initUser=function(b){var c=this;return c.debug("_initUser:",b),c.user=new a.User(b),c.currUser=c.user,c},e.prototype._setUpListeners=function(){var a=this;a.lastAjax={},$(document).bind("ajaxSend",function(b,c,d){var e=d.data;try{e=JSON.parse(e)}catch(f){}a.lastAjax={url:location.href.slice(0,-1)+d.url,data:e}})},e.prototype.toString=function(){var a=this.user.get("email")||"(anonymous)";return"GalaxyApp("+a+")"},{GalaxyApp:e}});
require("./libs/common-libs"),define(["mvc/user/user-model","utils/metrics-logger","utils/add-logging","utils/localization"],function(a,b,c,d){function e(a,b){var c=this;return c._init(a||{},b||{})}return c(e,"GalaxyApp"),e.prototype.defaultOptions={patchExisting:!0,root:"/"},e.prototype._init=function(a,b){var c=this;return console.debug("bootstrapped:",b),_.extend(c,Backbone.Events),c._processOptions(a),c.debug("GalaxyApp.options: ",c.options),c._patchGalaxy(window.Galaxy),c._initLogger(a.loggerOptions||{}),c.debug("GalaxyApp.logger: ",c.logger),c._initLocale(),c.debug("GalaxyApp.localize: ",c.localize),c.config=a.config||b.config||{},c.debug("GalaxyApp.config: ",c.config),c._initUser(a.user||b.user||{}),c.debug("GalaxyApp.user: ",c.user),c._setUpListeners(),c.trigger("ready",c),c},e.prototype._processOptions=function(a){var b=this,c=b.defaultOptions;b.debug("_processOptions: ",a),b.options={};for(var d in c)c.hasOwnProperty(d)&&(b.options[d]=a.hasOwnProperty(d)?a[d]:c[d]);return b},e.prototype._patchGalaxy=function(a){var b=this;if(b.options.patchExisting&&a){b.debug("found existing Galaxy object:",a);for(var c in a)a.hasOwnProperty(c)&&(b.debug(" patching in "+c+" to Galaxy"),b[c]=a[c])}},e.prototype._initLogger=function(a){var c=this;return c.debug("_initLogger:",a),c.logger=new b.MetricsLogger(a),c},e.prototype._initLocale=function(a){var b=this;return b.debug("_initLocale:",a),b.localize=d,window._l=b.localize,b},e.prototype._initUser=function(b){var c=this;return c.debug("_initUser:",b),c.user=new a.User(b),c.currUser=c.user,c},e.prototype._setUpListeners=function(){var a=this;return a.lastAjax={},$(document).bind("ajaxSend",function(b,c,d){var e=d.data;try{e=JSON.parse(e)}catch(f){}a.lastAjax={url:location.href.slice(0,-1)+d.url,data:e}}),a._listenToGalaxyMain(),a},e.prototype._listenToGalaxyMain=function(){var a=this,b="iframe#galaxy_main",c=$(b);if(c=c.size()?c.get(0).contentWindow:void 0){var d=function(){try{var c=$(b).get(0).contentWindow,d=c.location.pathname+c.location.search+c.location.hash;a.trigger("galaxy_main:load",{fullpath:d,pathname:c.location.pathname,search:c.location.search,hash:c.location.hash})}catch(e){a.debug("Error handling main frame load:",e)}};$(b).on("load",d)}else a.debug("No galaxy_main found")},e.prototype.toString=function(){var a=this.user.get("email")||"(anonymous)";return"GalaxyApp("+a+")"},{GalaxyApp:e}});
//# sourceMappingURL=../maps/galaxy-app-webpack.js.map