Some cosmetic changes.

- Loading 'pgadmin' as 'sources/pgadmin', as found under the 'sources'
  reference directory to be consistent with other files.
- Removed the 'pgadmin' reference from the base.html template.
- Renamed 'pgadmin.slickgrid.editors.js', and
  'pgadmin.slickgrid.formatters.js' as 'editors.js', and 'formatters.js'
  respectively, as they're already in the 'pgadmin/static/js/slickgrid'
  directory.
- Removed the duplicate entry of 'translations' from the webpack.shim.js
This commit is contained in:
Ashesh Vashi 2017-08-09 08:32:16 +05:30
parent e418cb8387
commit 845025db8f
83 changed files with 86 additions and 86 deletions

View File

@ -1,5 +1,5 @@
define( define(
['jquery', 'alertify', 'pgadmin', 'underscore.string', 'sources/gettext', ['jquery', 'alertify', 'sources/pgadmin', 'underscore.string', 'sources/gettext',
'sources/url_for' 'sources/url_for'
], ],
function($, alertify, pgAdmin, S, gettext, url_for) { function($, alertify, pgAdmin, S, gettext, url_for) {

View File

@ -1,5 +1,5 @@
define('pgadmin.node.cast', [ define('pgadmin.node.cast', [
'sources/gettext', 'sources/url_for', 'jquery', 'underscore', 'underscore.string', 'pgadmin', 'sources/gettext', 'sources/url_for', 'jquery', 'underscore', 'underscore.string', 'sources/pgadmin',
'pgadmin.browser', 'pgadmin.alertifyjs', 'pgadmin.browser.collection' 'pgadmin.browser', 'pgadmin.alertifyjs', 'pgadmin.browser.collection'
], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, alertify) { ], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, alertify) {
// Extend the collection class for cast // Extend the collection class for cast

View File

@ -1,6 +1,6 @@
define('pgadmin.node.event_trigger', [ define('pgadmin.node.event_trigger', [
'sources/gettext', 'sources/url_for', 'jquery', 'underscore', 'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
'underscore.string', 'pgadmin', 'pgadmin.browser', 'alertify', 'underscore.string', 'sources/pgadmin', 'pgadmin.browser', 'alertify',
'pgadmin.browser.collection' 'pgadmin.browser.collection'
], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, alertify) { ], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, alertify) {

View File

@ -1,6 +1,6 @@
define('pgadmin.node.extension', [ define('pgadmin.node.extension', [
'sources/gettext', 'sources/url_for', 'jquery', 'underscore', 'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
'underscore.string', 'pgadmin', 'pgadmin.browser', 'underscore.string', 'sources/pgadmin', 'pgadmin.browser',
'pgadmin.browser.collection' 'pgadmin.browser.collection'
], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser) { ], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser) {

View File

@ -1,5 +1,5 @@
define('pgadmin.node.foreign_server', [ define('pgadmin.node.foreign_server', [
'sources/gettext', 'jquery', 'underscore', 'underscore.string', 'pgadmin', 'sources/gettext', 'jquery', 'underscore', 'underscore.string', 'sources/pgadmin',
'pgadmin.browser', 'alertify', 'pgadmin.browser.collection', 'pgadmin.browser', 'alertify', 'pgadmin.browser.collection',
'pgadmin.browser.server.privilege' 'pgadmin.browser.server.privilege'
], function(gettext, $, _, S, pgAdmin, pgBrowser, alertify) { ], function(gettext, $, _, S, pgAdmin, pgBrowser, alertify) {

View File

@ -1,5 +1,5 @@
define('pgadmin.node.user_mapping', [ define('pgadmin.node.user_mapping', [
'sources/gettext', 'sources/url_for', 'jquery', 'underscore', 'underscore.string', 'pgadmin', 'sources/gettext', 'sources/url_for', 'jquery', 'underscore', 'underscore.string', 'sources/pgadmin',
'pgadmin.browser', 'alertify', 'pgadmin.browser.collection' 'pgadmin.browser', 'alertify', 'pgadmin.browser.collection'
], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, alertify) { ], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, alertify) {

View File

@ -1,6 +1,6 @@
define('pgadmin.node.foreign_data_wrapper', [ define('pgadmin.node.foreign_data_wrapper', [
'sources/gettext', 'sources/url_for', 'jquery', 'underscore', 'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
'underscore.string', 'pgadmin', 'pgadmin.browser', 'alertify', 'underscore.string', 'sources/pgadmin', 'pgadmin.browser', 'alertify',
'pgadmin.browser.collection', 'pgadmin.browser.server.privilege' 'pgadmin.browser.collection', 'pgadmin.browser.server.privilege'
], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, alertify) { ], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, alertify) {

View File

@ -1,6 +1,6 @@
define('pgadmin.node.language', [ define('pgadmin.node.language', [
'sources/gettext', 'sources/url_for', 'jquery', 'underscore', 'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
'underscore.string', 'pgadmin', 'pgadmin.browser', 'alertify', 'underscore.string', 'sources/pgadmin', 'pgadmin.browser', 'alertify',
'pgadmin.browser.collection', 'pgadmin.browser.server.privilege' 'pgadmin.browser.collection', 'pgadmin.browser.server.privilege'
], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, alertify) { ], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, alertify) {

View File

@ -1,5 +1,5 @@
define('pgadmin.node.catalog_object_column', [ define('pgadmin.node.catalog_object_column', [
'sources/gettext', 'jquery', 'underscore', 'underscore.string', 'pgadmin', 'sources/gettext', 'jquery', 'underscore', 'underscore.string', 'sources/pgadmin',
'pgadmin.browser', 'alertify', 'pgadmin.browser.collection' 'pgadmin.browser', 'alertify', 'pgadmin.browser.collection'
], function(gettext, $, _, S, pgAdmin, pgBrowser, alertify) { ], function(gettext, $, _, S, pgAdmin, pgBrowser, alertify) {

View File

@ -1,5 +1,5 @@
define('pgadmin.node.catalog_object', [ define('pgadmin.node.catalog_object', [
'sources/gettext', 'jquery', 'underscore', 'underscore.string', 'pgadmin', 'sources/gettext', 'jquery', 'underscore', 'underscore.string', 'sources/pgadmin',
'pgadmin.browser', 'alertify', 'pgadmin.browser.collection' 'pgadmin.browser', 'alertify', 'pgadmin.browser.collection'
], function(gettext, $, _, S, pgAdmin, pgBrowser, alertify) { ], function(gettext, $, _, S, pgAdmin, pgBrowser, alertify) {

View File

@ -1,6 +1,6 @@
define('pgadmin.node.collation', [ define('pgadmin.node.collation', [
'sources/gettext', 'sources/url_for', 'jquery', 'underscore', 'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
'underscore.string', 'pgadmin', 'pgadmin.browser', 'alertify', 'underscore.string', 'sources/pgadmin', 'pgadmin.browser', 'alertify',
'pgadmin.browser.collection' 'pgadmin.browser.collection'
], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, alertify) { ], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, alertify) {

View File

@ -1,7 +1,7 @@
// Domain Constraint Module: Collection and Node // Domain Constraint Module: Collection and Node
define('pgadmin.node.domain_constraints', [ define('pgadmin.node.domain_constraints', [
'sources/gettext', 'sources/url_for', 'jquery', 'underscore', 'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
'underscore.string', 'pgadmin', 'pgadmin.browser', 'alertify', 'underscore.string', 'sources/pgadmin', 'pgadmin.browser', 'alertify',
'pgadmin.browser.collection' 'pgadmin.browser.collection'
], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, alertify) { ], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, alertify) {

View File

@ -1,6 +1,6 @@
// Domain Module: Collection and Node. // Domain Module: Collection and Node.
define('pgadmin.node.domain', [ define('pgadmin.node.domain', [
'sources/gettext', 'sources/url_for', 'jquery', 'underscore', 'underscore.string', 'pgadmin', 'sources/gettext', 'sources/url_for', 'jquery', 'underscore', 'underscore.string', 'sources/pgadmin',
'pgadmin.browser', 'alertify', 'pgadmin.browser.collection' 'pgadmin.browser', 'alertify', 'pgadmin.browser.collection'
], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, alertify) { ], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, alertify) {

View File

@ -1,7 +1,7 @@
/* Create and Register Foreign Table Collection and Node. */ /* Create and Register Foreign Table Collection and Node. */
define('pgadmin.node.foreign-table', [ define('pgadmin.node.foreign-table', [
'sources/gettext', 'sources/url_for', 'jquery', 'underscore', 'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
'underscore.string', 'pgadmin', 'pgadmin.browser', 'alertify', 'underscore.string', 'sources/pgadmin', 'pgadmin.browser', 'alertify',
'pgadmin.browser.collection' 'pgadmin.browser.collection'
], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, alertify) { ], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, alertify) {

View File

@ -1,7 +1,7 @@
/* Create and Register Foreign Table Collection and Node. */ /* Create and Register Foreign Table Collection and Node. */
define('pgadmin.node.foreign_table', [ define('pgadmin.node.foreign_table', [
'sources/gettext', 'sources/url_for', 'jquery', 'underscore', 'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
'underscore.string', 'pgadmin', 'pgadmin.browser', 'alertify', 'underscore.string', 'sources/pgadmin', 'pgadmin.browser', 'alertify',
'pgadmin.browser.collection' 'pgadmin.browser.collection'
], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, alertify) { ], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, alertify) {

View File

@ -1,6 +1,6 @@
define('pgadmin.node.fts_configuration', [ define('pgadmin.node.fts_configuration', [
'sources/gettext', 'sources/url_for', 'jquery', 'underscore', 'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
'underscore.string', 'pgadmin', 'pgadmin.browser', 'alertify', 'underscore.string', 'sources/pgadmin', 'pgadmin.browser', 'alertify',
'pgadmin.browser.collection' 'pgadmin.browser.collection'
], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, alertify) { ], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, alertify) {

View File

@ -1,6 +1,6 @@
define('pgadmin.node.fts_dictionary', [ define('pgadmin.node.fts_dictionary', [
'sources/gettext', 'sources/url_for', 'jquery', 'underscore', 'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
'underscore.string', 'pgadmin', 'pgadmin.browser', 'alertify', 'underscore.string', 'sources/pgadmin', 'pgadmin.browser', 'alertify',
'pgadmin.browser.collection' 'pgadmin.browser.collection'
], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, alertify) { ], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, alertify) {

View File

@ -1,6 +1,6 @@
define('pgadmin.node.fts_parser', [ define('pgadmin.node.fts_parser', [
'sources/gettext', 'sources/url_for', 'jquery', 'underscore', 'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
'underscore.string', 'pgadmin', 'pgadmin.browser', 'alertify', 'underscore.string', 'sources/pgadmin', 'pgadmin.browser', 'alertify',
'pgadmin.browser.collection' 'pgadmin.browser.collection'
], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, alertify) { ], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, alertify) {

View File

@ -1,6 +1,6 @@
define('pgadmin.node.fts_template', [ define('pgadmin.node.fts_template', [
'sources/gettext', 'sources/url_for', 'jquery', 'underscore', 'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
'underscore.string', 'pgadmin', 'pgadmin.browser', 'alertify', 'underscore.string', 'sources/pgadmin', 'pgadmin.browser', 'alertify',
'pgadmin.browser.collection' 'pgadmin.browser.collection'
], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, alertify) { ], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, alertify) {

View File

@ -1,7 +1,7 @@
/* Create and Register Function Collection and Node. */ /* Create and Register Function Collection and Node. */
define('pgadmin.node.function', [ define('pgadmin.node.function', [
'sources/gettext', 'sources/url_for', 'jquery', 'underscore', 'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
'underscore.string', 'pgadmin', 'pgadmin.browser', 'alertify', 'underscore.string', 'sources/pgadmin', 'pgadmin.browser', 'alertify',
'pgadmin.browser.collection', 'pgadmin.browser.server.privilege' 'pgadmin.browser.collection', 'pgadmin.browser.server.privilege'
], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, alertify) { ], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, alertify) {

View File

@ -1,7 +1,7 @@
/* Create and Register Procedure Collection and Node. */ /* Create and Register Procedure Collection and Node. */
define('pgadmin.node.procedure', [ define('pgadmin.node.procedure', [
'sources/gettext', 'sources/url_for', 'jquery', 'underscore', 'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
'underscore.string', 'pgadmin', 'pgadmin.browser', 'alertify', 'underscore.string', 'sources/pgadmin', 'pgadmin.browser', 'alertify',
'pgadmin.node.function', 'pgadmin.browser.collection', 'pgadmin.node.function', 'pgadmin.browser.collection',
'pgadmin.browser.server.privilege' 'pgadmin.browser.server.privilege'
], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, alertify, Function) { ], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, alertify, Function) {

View File

@ -1,7 +1,7 @@
/* Create and Register Function Collection and Node. */ /* Create and Register Function Collection and Node. */
define('pgadmin.node.trigger_function', [ define('pgadmin.node.trigger_function', [
'sources/gettext', 'sources/url_for', 'jquery', 'underscore', 'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
'underscore.string', 'pgadmin', 'pgadmin.browser', 'alertify', 'underscore.string', 'sources/pgadmin', 'pgadmin.browser', 'alertify',
'pgadmin.browser.collection', 'pgadmin.browser.server.privilege' 'pgadmin.browser.collection', 'pgadmin.browser.server.privilege'
], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, alertify) { ], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, alertify) {

View File

@ -1,7 +1,7 @@
/* Create and Register Function Collection and Node. */ /* Create and Register Function Collection and Node. */
define('pgadmin.node.edbfunc', [ define('pgadmin.node.edbfunc', [
'sources/gettext', 'sources/url_for', 'jquery', 'underscore', 'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
'underscore.string', 'pgadmin', 'pgadmin.browser', 'alertify', 'underscore.string', 'sources/pgadmin', 'pgadmin.browser', 'alertify',
'pgadmin.browser.collection', 'pgadmin.browser.server.privilege' 'pgadmin.browser.collection', 'pgadmin.browser.server.privilege'
], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, alertify) { ], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, alertify) {

View File

@ -1,7 +1,7 @@
/* Create and Register Procedure Collection and Node. */ /* Create and Register Procedure Collection and Node. */
define('pgadmin.node.edbproc', [ define('pgadmin.node.edbproc', [
'sources/gettext', 'sources/url_for', 'jquery', 'underscore', 'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
'underscore.string', 'pgadmin', 'pgadmin.browser', 'alertify', 'underscore.string', 'sources/pgadmin', 'pgadmin.browser', 'alertify',
'pgadmin.node.edbfunc', 'pgadmin.browser.collection', 'pgadmin.node.edbfunc', 'pgadmin.browser.collection',
'pgadmin.browser.server.privilege' 'pgadmin.browser.server.privilege'
], function( ], function(

View File

@ -1,7 +1,7 @@
/* Create and Register Function Collection and Node. */ /* Create and Register Function Collection and Node. */
define('pgadmin.node.edbvar', [ define('pgadmin.node.edbvar', [
'sources/gettext', 'sources/url_for', 'jquery', 'underscore', 'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
'underscore.string', 'pgadmin', 'pgadmin.browser', 'alertify', 'underscore.string', 'sources/pgadmin', 'pgadmin.browser', 'alertify',
'pgadmin.browser.collection', 'pgadmin.browser.server.privilege' 'pgadmin.browser.collection', 'pgadmin.browser.server.privilege'
], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, alertify) { ], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, alertify) {

View File

@ -1,6 +1,6 @@
define('pgadmin.node.package', [ define('pgadmin.node.package', [
'sources/gettext', 'sources/url_for', 'jquery', 'underscore', 'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
'underscore.string', 'pgadmin', 'pgadmin.browser', 'alertify', 'underscore.string', 'sources/pgadmin', 'pgadmin.browser', 'alertify',
'pgadmin.browser.collection' 'pgadmin.browser.collection'
], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, alertify) { ], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, alertify) {

View File

@ -1,6 +1,6 @@
define('pgadmin.node.sequence', [ define('pgadmin.node.sequence', [
'sources/gettext', 'sources/url_for', 'jquery', 'underscore', 'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
'underscore.string', 'pgadmin', 'pgadmin.browser', 'alertify', 'underscore.string', 'sources/pgadmin', 'pgadmin.browser', 'alertify',
'pgadmin.browser.collection' 'pgadmin.browser.collection'
], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, alertify) { ], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, alertify) {

View File

@ -1,5 +1,5 @@
define('pgadmin.node.catalog', [ define('pgadmin.node.catalog', [
'sources/gettext', 'jquery', 'underscore', 'underscore.string', 'pgadmin', 'sources/gettext', 'jquery', 'underscore', 'underscore.string', 'sources/pgadmin',
'pgadmin.browser', 'backform', 'alertify', 'pgadmin.browser.collection' 'pgadmin.browser', 'backform', 'alertify', 'pgadmin.browser.collection'
], function(gettext, $, _, S, pgAdmin, pgBrowser, Backform, alertify) { ], function(gettext, $, _, S, pgAdmin, pgBrowser, Backform, alertify) {

View File

@ -1,6 +1,6 @@
define('pgadmin.node.schema', [ define('pgadmin.node.schema', [
'sources/gettext', 'sources/url_for', 'jquery', 'underscore', 'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
'underscore.string', 'pgadmin', 'pgadmin.browser', 'backform', 'alertify', 'underscore.string', 'sources/pgadmin', 'pgadmin.browser', 'backform', 'alertify',
'pgadmin.browser.collection', 'pgadmin.browser.server.privilege' 'pgadmin.browser.collection', 'pgadmin.browser.server.privilege'
], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, Backform, alertify) { ], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, Backform, alertify) {

View File

@ -1,6 +1,6 @@
define('pgadmin.node.synonym', [ define('pgadmin.node.synonym', [
'sources/gettext', 'sources/url_for', 'jquery', 'underscore', 'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
'underscore.string', 'pgadmin', 'pgadmin.browser', 'pgadmin.alertifyjs', 'underscore.string', 'sources/pgadmin', 'pgadmin.browser', 'pgadmin.alertifyjs',
'pgadmin.browser.collection' 'pgadmin.browser.collection'
], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, alertify) { ], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, alertify) {

View File

@ -1,6 +1,6 @@
define('pgadmin.node.column', [ define('pgadmin.node.column', [
'sources/gettext', 'sources/url_for', 'jquery', 'underscore', 'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
'underscore.string', 'pgadmin', 'pgadmin.browser', 'backform', 'alertify', 'underscore.string', 'sources/pgadmin', 'pgadmin.browser', 'backform', 'alertify',
'pgadmin.browser.collection' 'pgadmin.browser.collection'
], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, Backform, alertify) { ], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, Backform, alertify) {

View File

@ -1,7 +1,7 @@
// Check Constraint Module: Node // Check Constraint Module: Node
define('pgadmin.node.check_constraint', [ define('pgadmin.node.check_constraint', [
'sources/gettext', 'sources/url_for', 'jquery', 'underscore', 'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
'underscore.string', 'pgadmin', 'pgadmin.browser', 'pgadmin.alertifyjs', 'underscore.string', 'sources/pgadmin', 'pgadmin.browser', 'pgadmin.alertifyjs',
'pgadmin.browser.collection' 'pgadmin.browser.collection'
], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, alertify) { ], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, alertify) {

View File

@ -1,6 +1,6 @@
define('pgadmin.node.exclusion_constraint', [ define('pgadmin.node.exclusion_constraint', [
'sources/gettext', 'sources/url_for', 'jquery', 'underscore', 'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
'underscore.string', 'pgadmin', 'pgadmin.browser', 'alertify', 'underscore.string', 'sources/pgadmin', 'pgadmin.browser', 'alertify',
'pgadmin.browser.collection' 'pgadmin.browser.collection'
], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, Alertify) { ], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, Alertify) {

View File

@ -1,6 +1,6 @@
define('pgadmin.node.foreign_key', [ define('pgadmin.node.foreign_key', [
'sources/gettext', 'sources/url_for', 'jquery', 'underscore', 'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
'underscore.string', 'pgadmin', 'pgadmin.browser', 'pgadmin.alertifyjs', 'underscore.string', 'sources/pgadmin', 'pgadmin.browser', 'pgadmin.alertifyjs',
'pgadmin.browser.collection' 'pgadmin.browser.collection'
], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, alertify) { ], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, alertify) {

View File

@ -1,6 +1,6 @@
define('pgadmin.node.primary_key', [ define('pgadmin.node.primary_key', [
'sources/gettext', 'sources/url_for', 'jquery', 'underscore', 'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
'underscore.string', 'pgadmin', 'pgadmin.browser', 'alertify', 'underscore.string', 'sources/pgadmin', 'pgadmin.browser', 'alertify',
'pgadmin.browser.collection' 'pgadmin.browser.collection'
], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, alertify) { ], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, alertify) {

View File

@ -1,6 +1,6 @@
define('pgadmin.node.unique_constraint', [ define('pgadmin.node.unique_constraint', [
'sources/gettext', 'sources/url_for', 'jquery', 'underscore', 'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
'underscore.string', 'pgadmin', 'pgadmin.browser', 'alertify', 'underscore.string', 'sources/pgadmin', 'pgadmin.browser', 'alertify',
'pgadmin.browser.collection' 'pgadmin.browser.collection'
], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, alertify) { ], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, alertify) {

View File

@ -1,5 +1,5 @@
define('pgadmin.node.constraints', [ define('pgadmin.node.constraints', [
'sources/gettext', 'jquery', 'underscore', 'underscore.string', 'pgadmin', 'sources/gettext', 'jquery', 'underscore', 'underscore.string', 'sources/pgadmin',
'pgadmin.browser', 'pgadmin.browser.collection', 'pgadmin.node.unique_constraint', 'pgadmin.browser', 'pgadmin.browser.collection', 'pgadmin.node.unique_constraint',
'pgadmin.node.check_constraint', 'pgadmin.node.foreign_key', 'pgadmin.node.check_constraint', 'pgadmin.node.foreign_key',
'pgadmin.node.exclusion_constraint', 'pgadmin.node.primary_key' 'pgadmin.node.exclusion_constraint', 'pgadmin.node.primary_key'

View File

@ -1,6 +1,6 @@
define('pgadmin.node.index', [ define('pgadmin.node.index', [
'sources/gettext', 'sources/url_for', 'jquery', 'underscore', 'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
'underscore.string', 'pgadmin', 'pgadmin.browser', 'backform', 'alertify', 'underscore.string', 'sources/pgadmin', 'pgadmin.browser', 'backform', 'alertify',
'pgadmin.browser.collection' 'pgadmin.browser.collection'
], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, Backform, alertify) { ], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, Backform, alertify) {

View File

@ -1,6 +1,6 @@
define([ define([
'sources/gettext', 'sources/url_for', 'jquery', 'underscore', 'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
'underscore.string', 'pgadmin', 'pgadmin.browser', 'backform', 'pgadmin.alertifyjs', 'underscore.string', 'sources/pgadmin', 'pgadmin.browser', 'backform', 'pgadmin.alertifyjs',
'pgadmin.browser.collection', 'pgadmin.browser.table.partition.utils' 'pgadmin.browser.collection', 'pgadmin.browser.table.partition.utils'
], ],
function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, Backform, alertify) { function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, Backform, alertify) {

View File

@ -1,6 +1,6 @@
define('pgadmin.node.rule', [ define('pgadmin.node.rule', [
'sources/gettext', 'sources/url_for', 'jquery', 'underscore', 'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
'underscore.string', 'pgadmin', 'pgadmin.browser', 'codemirror' 'underscore.string', 'sources/pgadmin', 'pgadmin.browser', 'codemirror'
], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, CodeMirror) { ], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, CodeMirror) {
/** /**

View File

@ -1,6 +1,6 @@
define('pgadmin.node.table', [ define('pgadmin.node.table', [
'sources/gettext', 'sources/url_for', 'jquery', 'underscore', 'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
'underscore.string', 'pgadmin', 'pgadmin.browser', 'pgadmin.alertifyjs', 'underscore.string', 'sources/pgadmin', 'pgadmin.browser', 'pgadmin.alertifyjs',
'pgadmin.browser.collection', 'pgadmin.node.column', 'pgadmin.browser.collection', 'pgadmin.node.column',
'pgadmin.node.constraints', 'pgadmin.browser.table.partition.utils' 'pgadmin.node.constraints', 'pgadmin.browser.table.partition.utils'
], function( ], function(

View File

@ -1,6 +1,6 @@
define('pgadmin.node.trigger', [ define('pgadmin.node.trigger', [
'sources/gettext', 'sources/url_for', 'jquery', 'underscore', 'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
'underscore.string', 'pgadmin', 'pgadmin.browser', 'backform', 'pgadmin.alertifyjs', 'underscore.string', 'sources/pgadmin', 'pgadmin.browser', 'backform', 'pgadmin.alertifyjs',
'pgadmin.browser.collection' 'pgadmin.browser.collection'
], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, Backform, alertify) { ], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, Backform, alertify) {

View File

@ -1,6 +1,6 @@
define('pgadmin.node.type', [ define('pgadmin.node.type', [
'sources/gettext', 'sources/url_for', 'jquery', 'underscore', 'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
'underscore.string', 'pgadmin', 'pgadmin.browser', 'alertify', 'backgrid', 'underscore.string', 'sources/pgadmin', 'pgadmin.browser', 'alertify', 'backgrid',
'pgadmin.backgrid', 'pgadmin.browser.collection' 'pgadmin.backgrid', 'pgadmin.browser.collection'
], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, alertify, Backgrid) { ], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, alertify, Backgrid) {

View File

@ -1,6 +1,6 @@
define('pgadmin.node.mview', [ define('pgadmin.node.mview', [
'sources/gettext', 'sources/url_for', 'jquery', 'underscore', 'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
'underscore.string', 'pgadmin', 'pgadmin.alertifyjs', 'pgadmin.browser', 'codemirror', 'underscore.string', 'sources/pgadmin', 'pgadmin.alertifyjs', 'pgadmin.browser', 'codemirror',
'pgadmin.browser.server.privilege' 'pgadmin.browser.server.privilege'
], function(gettext, url_for, $, _, S, pgAdmin, alertify, pgBrowser, CodeMirror) { ], function(gettext, url_for, $, _, S, pgAdmin, alertify, pgBrowser, CodeMirror) {

View File

@ -1,6 +1,6 @@
define('pgadmin.node.view', [ define('pgadmin.node.view', [
'sources/gettext', 'sources/gettext',
'sources/url_for', 'jquery', 'underscore', 'underscore.string', 'pgadmin', 'sources/url_for', 'jquery', 'underscore', 'underscore.string', 'sources/pgadmin',
'pgadmin.browser', 'codemirror', 'pgadmin.browser.server.privilege', 'pgadmin.browser', 'codemirror', 'pgadmin.browser.server.privilege',
'pgadmin.node.rule' 'pgadmin.node.rule'
], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, CodeMirror) { ], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, CodeMirror) {

View File

@ -1,6 +1,6 @@
define('pgadmin.node.database', [ define('pgadmin.node.database', [
'sources/gettext', 'sources/url_for', 'jquery', 'underscore', 'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
'underscore.string', 'pgadmin', 'pgadmin.browser.utils', 'pgadmin.alertifyjs', 'underscore.string', 'sources/pgadmin', 'pgadmin.browser.utils', 'pgadmin.alertifyjs',
'pgadmin.browser.collection', 'pgadmin.browser.server.privilege', 'pgadmin.browser.collection', 'pgadmin.browser.server.privilege',
'pgadmin.browser.server.variable' 'pgadmin.browser.server.variable'
], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, Alertify) { ], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, Alertify) {

View File

@ -1,6 +1,6 @@
define('pgadmin.node.pga_schedule', [ define('pgadmin.node.pga_schedule', [
'sources/gettext', 'sources/url_for', 'jquery', 'underscore', 'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
'underscore.string', 'pgadmin', 'moment', 'pgadmin.browser', 'alertify', 'underscore.string', 'sources/pgadmin', 'moment', 'pgadmin.browser', 'alertify',
'backform', 'pgadmin.backform' 'backform', 'pgadmin.backform'
], function(gettext, url_for, $, _, S, pgAdmin, moment, pgBrowser, Alertify, Backform) { ], function(gettext, url_for, $, _, S, pgAdmin, moment, pgBrowser, Alertify, Backform) {

View File

@ -1,6 +1,6 @@
define('pgadmin.node.pga_job', [ define('pgadmin.node.pga_job', [
'sources/gettext', 'sources/url_for', 'jquery', 'underscore', 'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
'underscore.string', 'pgadmin', 'pgadmin.browser', 'pgadmin.alertifyjs', 'underscore.string', 'sources/pgadmin', 'pgadmin.browser', 'pgadmin.alertifyjs',
'pgadmin.node.pga_jobstep', 'pgadmin.node.pga_schedule' 'pgadmin.node.pga_jobstep', 'pgadmin.node.pga_schedule'
], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, alertify) { ], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, alertify) {

View File

@ -1,6 +1,6 @@
define('pgadmin.node.pga_jobstep', [ define('pgadmin.node.pga_jobstep', [
'sources/gettext', 'sources/url_for', 'jquery', 'underscore', 'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
'underscore.string', 'pgadmin', 'pgadmin.browser', 'alertify', 'backform', 'underscore.string', 'sources/pgadmin', 'pgadmin.browser', 'alertify', 'backform',
'pgadmin.backform' 'pgadmin.backform'
], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, Alertify, Backform) { ], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, Alertify, Backform) {

View File

@ -1,6 +1,6 @@
define('pgadmin.node.role', [ define('pgadmin.node.role', [
'sources/gettext', 'sources/url_for', 'jquery', 'underscore', 'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
'underscore.string', 'pgadmin', 'pgadmin.browser', 'alertify', 'underscore.string', 'sources/pgadmin', 'pgadmin.browser', 'alertify',
'pgadmin.backform', 'select2', 'pgadmin.browser.collection', 'pgadmin.backform', 'select2', 'pgadmin.browser.collection',
'pgadmin.browser.node.ui', 'pgadmin.browser.server.variable' 'pgadmin.browser.node.ui', 'pgadmin.browser.server.variable'
], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, alertify, Backform) { ], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, alertify, Backform) {

View File

@ -1,6 +1,6 @@
define('pgadmin.node.server', [ define('pgadmin.node.server', [
'sources/gettext', 'sources/url_for', 'jquery', 'underscore', 'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
'underscore.string', 'pgadmin', 'pgadmin.browser', 'underscore.string', 'sources/pgadmin', 'pgadmin.browser',
'pgadmin.server.supported_servers', 'pgadmin.server.supported_servers',
'pgadmin.user_management.current_user', 'pgadmin.user_management.current_user',
'pgadmin.alertifyjs', 'pgadmin.browser.server.privilege' 'pgadmin.alertifyjs', 'pgadmin.browser.server.privilege'

View File

@ -1,6 +1,6 @@
define([ define([
'underscore', 'jquery', 'backbone', 'backform', 'backgrid', 'alertify', 'underscore', 'jquery', 'backbone', 'backform', 'backgrid', 'alertify',
'pgadmin', 'pgadmin.browser.node', 'pgadmin.browser.node.ui' 'sources/pgadmin', 'pgadmin.browser.node', 'pgadmin.browser.node.ui'
], ],
function(_, $, Backbone, Backform, Backgrid, Alertify, pgAdmin, pgNode) { function(_, $, Backbone, Backform, Backgrid, Alertify, pgAdmin, pgNode) {

View File

@ -1,6 +1,6 @@
define('pgadmin.node.tablespace', [ define('pgadmin.node.tablespace', [
'sources/gettext', 'sources/url_for', 'jquery', 'underscore', 'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
'underscore.string', 'pgadmin', 'pgadmin.browser', 'pgadmin.alertifyjs', 'underscore.string', 'sources/pgadmin', 'pgadmin.browser', 'pgadmin.alertifyjs',
'pgadmin.browser.collection', 'pgadmin.browser.node.ui', 'pgadmin.browser.collection', 'pgadmin.browser.node.ui',
'pgadmin.browser.server.privilege' 'pgadmin.browser.server.privilege'
], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, alertify) { ], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, alertify) {

View File

@ -1,5 +1,5 @@
define('pgadmin.node.server_group', [ define('pgadmin.node.server_group', [
'sources/gettext', 'sources/url_for', 'jquery', 'underscore', 'pgadmin', 'sources/gettext', 'sources/url_for', 'jquery', 'underscore', 'sources/pgadmin',
'backbone', 'pgadmin.browser', 'pgadmin.browser.node' 'backbone', 'pgadmin.browser', 'pgadmin.browser.node'
], function(gettext, url_for, $, _, pgAdmin, Backbone) { ], function(gettext, url_for, $, _, pgAdmin, Backbone) {

View File

@ -1,13 +1,14 @@
define( define(
'pgadmin.browser', [ 'pgadmin.browser', [
'sources/gettext', 'sources/url_for', 'require', 'jquery', 'underscore', 'underscore.string', 'sources/gettext', 'sources/url_for', 'require', 'jquery', 'underscore', 'underscore.string',
'bootstrap', 'pgadmin', 'pgadmin.alertifyjs', 'bundled_codemirror', 'bootstrap', 'sources/pgadmin', 'pgadmin.alertifyjs', 'bundled_codemirror',
'sources/check_node_visibility', 'pgadmin.browser.utils', 'wcdocker', 'sources/check_node_visibility', 'pgadmin.browser.utils', 'wcdocker',
'jquery.contextmenu', 'jquery.aciplugin', 'jquery.acitree', 'jquery.contextmenu', 'jquery.aciplugin', 'jquery.acitree',
'pgadmin.browser.messages', 'pgadmin.browser.messages',
'pgadmin.browser.menu', 'pgadmin.browser.panel', 'pgadmin.browser.menu', 'pgadmin.browser.panel',
'pgadmin.browser.error', 'pgadmin.browser.frame', 'pgadmin.browser.error', 'pgadmin.browser.frame',
'pgadmin.browser.node', 'pgadmin.browser.collection' 'pgadmin.browser.node', 'pgadmin.browser.collection',
'sources/codemirror/addon/fold/pgadmin-sqlfoldcode'
], function( ], function(
gettext, url_for, require, $, _, S, Bootstrap, pgAdmin, Alertify, gettext, url_for, require, $, _, S, Bootstrap, pgAdmin, Alertify,
codemirror, checkNodeVisibility codemirror, checkNodeVisibility

View File

@ -1,5 +1,5 @@
define([ define([
'sources/gettext', 'jquery', 'underscore', 'underscore.string', 'pgadmin', 'sources/gettext', 'jquery', 'underscore', 'underscore.string', 'sources/pgadmin',
'backbone', 'alertify', 'backform', 'backgrid', 'pgadmin.backform', 'pgadmin.backgrid', 'backbone', 'alertify', 'backform', 'backgrid', 'pgadmin.backform', 'pgadmin.backgrid',
'pgadmin.browser.node' 'pgadmin.browser.node'
], function(gettext, $, _, S, pgAdmin, Backbone, Alertify, Backform, Backgrid) { ], function(gettext, $, _, S, pgAdmin, Backbone, Alertify, Backform, Backgrid) {

View File

@ -1,5 +1,5 @@
define( define(
['underscore', 'underscore.string', 'pgadmin', 'jquery', 'backbone'], ['underscore', 'underscore.string', 'sources/pgadmin', 'jquery', 'backbone'],
function(_, S, pgAdmin, $, Backbone) { function(_, S, pgAdmin, $, Backbone) {
var pgBrowser = pgAdmin.Browser = pgAdmin.Browser || {}; var pgBrowser = pgAdmin.Browser = pgAdmin.Browser || {};

View File

@ -1,5 +1,5 @@
define( define(
['sources/gettext', 'underscore', 'alertify', 'pgadmin'], ['sources/gettext', 'underscore', 'alertify', 'sources/pgadmin'],
function(gettext, _, alertify, pgAdmin) { function(gettext, _, alertify, pgAdmin) {
pgAdmin.Browser = pgAdmin.Browser || {}; pgAdmin.Browser = pgAdmin.Browser || {};

View File

@ -1,5 +1,5 @@
define( define(
['underscore', 'pgadmin', 'wcdocker'], ['underscore', 'sources/pgadmin', 'wcdocker'],
function(_, pgAdmin) { function(_, pgAdmin) {
var pgBrowser = pgAdmin.Browser = pgAdmin.Browser || {}; var pgBrowser = pgAdmin.Browser = pgAdmin.Browser || {};

View File

@ -1,5 +1,5 @@
define( define(
['underscore', 'underscore.string', 'pgadmin', 'jquery'], ['underscore', 'underscore.string', 'sources/pgadmin', 'jquery'],
function(_, S, pgAdmin, $) { function(_, S, pgAdmin, $) {
'use strict'; 'use strict';

View File

@ -1,6 +1,6 @@
define( define(
'pgadmin.browser.node', [ 'pgadmin.browser.node', [
'sources/gettext', 'jquery', 'underscore', 'underscore.string', 'pgadmin', 'sources/gettext', 'jquery', 'underscore', 'underscore.string', 'sources/pgadmin',
'pgadmin.browser.menu', 'backbone', 'pgadmin.alertifyjs', 'pgadmin.browser.datamodel', 'pgadmin.browser.menu', 'backbone', 'pgadmin.alertifyjs', 'pgadmin.browser.datamodel',
'backform', 'pgadmin.browser.utils', 'pgadmin.backform' 'backform', 'pgadmin.browser.utils', 'pgadmin.backform'
], function(gettext, $, _, S, pgAdmin, Menu, Backbone, Alertify, pgBrowser, Backform) { ], function(gettext, $, _, S, pgAdmin, Menu, Backbone, Alertify, pgBrowser, Backform) {

View File

@ -1,5 +1,5 @@
define([ define([
'sources/gettext', 'jquery', 'underscore', 'pgadmin', 'backbone', 'backform', 'sources/gettext', 'jquery', 'underscore', 'sources/pgadmin', 'backbone', 'backform',
'alertify', 'backgrid', 'select2', 'pgadmin.browser.node' 'alertify', 'backgrid', 'select2', 'pgadmin.browser.node'
], ],
function(gettext, $, _, pgAdmin, Backbone, Backform, Alertify, Backgrid) { function(gettext, $, _, pgAdmin, Backbone, Backform, Alertify, Backgrid) {

View File

@ -1,5 +1,5 @@
define( define(
['underscore', 'pgadmin', 'wcdocker'], ['underscore', 'sources/pgadmin', 'wcdocker'],
function(_, pgAdmin) { function(_, pgAdmin) {
var pgBrowser = pgAdmin.Browser = pgAdmin.Browser || {}; var pgBrowser = pgAdmin.Browser = pgAdmin.Browser || {};

View File

@ -1,5 +1,5 @@
define( define(
['underscore', 'backbone', 'pgadmin', 'pgadmin.browser'], ['underscore', 'backbone', 'sources/pgadmin', 'pgadmin.browser'],
function(_, Backbone, pgAdmin, pgBrowser) { function(_, Backbone, pgAdmin, pgBrowser) {
pgBrowser = pgBrowser || pgAdmin.Browser || {}; pgBrowser = pgBrowser || pgAdmin.Browser || {};

View File

@ -1,6 +1,6 @@
define( define(
'pgadmin.browser.messages', 'pgadmin.browser.messages',
['sources/gettext', 'pgadmin'], ['sources/gettext', 'sources/pgadmin'],
function(gettext, pgAdmin) { function(gettext, pgAdmin) {
var pgBrowser = pgAdmin.Browser = pgAdmin.Browser || {}; var pgBrowser = pgAdmin.Browser = pgAdmin.Browser || {};

View File

@ -1,5 +1,5 @@
define('pgadmin.browser.utils', define('pgadmin.browser.utils',
['pgadmin'], function(pgAdmin) { ['sources/pgadmin'], function(pgAdmin) {
var pgBrowser = pgAdmin.Browser = pgAdmin.Browser || {}; var pgBrowser = pgAdmin.Browser = pgAdmin.Browser || {};
@ -85,4 +85,4 @@ define('pgadmin.browser.utils',
} }
}; };
return pgBrowser; return pgBrowser;
}); });

View File

@ -1,6 +1,6 @@
define('pgadmin.dashboard', [ define('pgadmin.dashboard', [
'sources/url_for', 'sources/gettext', 'require', 'jquery', 'underscore', 'sources/url_for', 'sources/gettext', 'require', 'jquery', 'underscore',
'pgadmin', 'backbone', 'backgrid', 'flotr2', 'sources/pgadmin', 'backbone', 'backgrid', 'flotr2',
'pgadmin.alertifyjs', 'backgrid.filter', 'pgadmin.alertifyjs', 'backgrid.filter',
'pgadmin.browser', 'bootstrap', 'wcdocker' 'pgadmin.browser', 'bootstrap', 'wcdocker'
], ],

View File

@ -1,5 +1,5 @@
define('misc.bgprocess', [ define('misc.bgprocess', [
'pgadmin', 'sources/gettext', 'sources/url_for', 'underscore', 'sources/pgadmin', 'sources/gettext', 'sources/url_for', 'underscore',
'underscore.string', 'jquery', 'pgadmin.browser', 'alertify', 'underscore.string', 'jquery', 'pgadmin.browser', 'alertify',
'pgadmin.browser.messages' 'pgadmin.browser.messages'
], function( ], function(

View File

@ -1,6 +1,6 @@
define ( define (
'pgadmin.misc.explain', 'pgadmin.misc.explain',
['sources/url_for', 'jquery', 'underscore', 'underscore.string', 'pgadmin', 'backbone', 'snapsvg'], ['sources/url_for', 'jquery', 'underscore', 'underscore.string', 'sources/pgadmin', 'backbone', 'snapsvg'],
function(url_for, $, _, S, pgAdmin, Backbone, Snap) { function(url_for, $, _, S, pgAdmin, Backbone, Snap) {
pgAdmin = pgAdmin || window.pgAdmin || {}; pgAdmin = pgAdmin || window.pgAdmin || {};

View File

@ -1,6 +1,6 @@
define('pgadmin.preferences', [ define('pgadmin.preferences', [
'sources/gettext', 'sources/url_for', 'jquery', 'underscore', 'alertify', 'sources/gettext', 'sources/url_for', 'jquery', 'underscore', 'alertify',
'pgadmin', 'backform', 'pgadmin.browser', 'pgadmin.backform' 'sources/pgadmin', 'backform', 'pgadmin.browser', 'pgadmin.backform'
], function(gettext, url_for, $, _, alertify, pgAdmin, Backform, pgBrowser) { ], function(gettext, url_for, $, _, alertify, pgAdmin, Backform, pgBrowser) {
// This defines the Preference/Options Dialog for pgAdmin IV. // This defines the Preference/Options Dialog for pgAdmin IV.
pgAdmin = pgAdmin || window.pgAdmin || {}; pgAdmin = pgAdmin || window.pgAdmin || {};

View File

@ -1,6 +1,6 @@
define('pgadmin.settings', define('pgadmin.settings',
[ [
'jquery', 'alertify', 'pgadmin', 'underscore', 'backform', 'jquery', 'alertify', 'sources/pgadmin', 'underscore', 'backform',
'sources/gettext', 'sources/url_for', 'pgadmin.backform' 'sources/gettext', 'sources/url_for', 'pgadmin.backform'
], ],
// This defines the Preference/Options Dialog for pgAdmin IV. // This defines the Preference/Options Dialog for pgAdmin IV.

View File

@ -1,5 +1,5 @@
define('app', [ define('app', [
'babel-polyfill', 'pgadmin', 'bundled_browser', 'pgadmin.datagrid' 'babel-polyfill', 'sources/pgadmin', 'bundled_browser', 'pgadmin.datagrid'
], function() { ], function() {
var initializeModules = function(Object) { var initializeModules = function(Object) {
for (var key in Object) { for (var key in Object) {

View File

@ -36,7 +36,6 @@
waitSeconds: 0, waitSeconds: 0,
shim: {}, shim: {},
paths: { paths: {
pgadmin: "{{ url_for('static', filename='js/pgadmin') }}",
sources: "{{ url_for('static', filename='js') }}", sources: "{{ url_for('static', filename='js') }}",
slickgrid: "{{ url_for('static', filename='js/generated/slickgrid') }}", slickgrid: "{{ url_for('static', filename='js/generated/slickgrid') }}",
codemirror: "{{ url_for('static', filename='js/generated/codemirror') }}", codemirror: "{{ url_for('static', filename='js/generated/codemirror') }}",

View File

@ -1,5 +1,5 @@
define('pgadmin.datagrid', [ define('pgadmin.datagrid', [
'sources/gettext', 'sources/url_for', 'jquery', 'underscore', 'alertify', 'pgadmin', 'sources/gettext', 'sources/url_for', 'jquery', 'underscore', 'alertify', 'sources/pgadmin',
'bundled_codemirror', 'bundled_codemirror',
'sources/sqleditor_utils', 'wcdocker' 'sources/sqleditor_utils', 'wcdocker'
], function(gettext, url_for, $, _, alertify, pgAdmin, CodeMirror, sqlEditorUtils) { ], function(gettext, url_for, $, _, alertify, pgAdmin, CodeMirror, sqlEditorUtils) {

View File

@ -1,6 +1,6 @@
define([ define([
'sources/gettext', 'sources/url_for', 'jquery', 'underscore', 'underscore.string', 'alertify', 'sources/gettext', 'sources/url_for', 'jquery', 'underscore', 'underscore.string', 'alertify',
'pgadmin', 'pgadmin.browser', 'backbone', 'backgrid', 'codemirror', 'sources/pgadmin', 'pgadmin.browser', 'backbone', 'backgrid', 'codemirror',
'backform', 'pgadmin.tools.debugger.ui', 'wcdocker', 'pgadmin.backform', 'backform', 'pgadmin.tools.debugger.ui', 'wcdocker', 'pgadmin.backform',
'pgadmin.backgrid', 'pgadmin.browser.frame' 'pgadmin.backgrid', 'pgadmin.browser.frame'
], function(gettext, url_for, $, _, S, Alertify, pgAdmin, pgBrowser, Backbone, Backgrid, CodeMirror, Backform, get_function_arguments) { ], function(gettext, url_for, $, _, S, Alertify, pgAdmin, pgBrowser, Backbone, Backgrid, CodeMirror, Backform, get_function_arguments) {

View File

@ -1,6 +1,6 @@
define([ define([
'sources/gettext', 'sources/url_for', 'jquery', 'underscore', 'underscore.string', 'alertify', 'sources/gettext', 'sources/url_for', 'jquery', 'underscore', 'underscore.string', 'alertify',
'pgadmin', 'pgadmin.browser', 'backbone', 'backgrid', 'codemirror', 'sources/pgadmin', 'pgadmin.browser', 'backbone', 'backgrid', 'codemirror',
'backform', 'wcdocker', 'pgadmin.backform', 'pgadmin.backgrid', 'backform', 'wcdocker', 'pgadmin.backform', 'pgadmin.backgrid',
'pgadmin.browser.panel' 'pgadmin.browser.panel'
], function(gettext, url_for, $, _, S, Alertify, pgAdmin, pgBrowser, Backbone, Backgrid, CodeMirror, Backform ) { ], function(gettext, url_for, $, _, S, Alertify, pgAdmin, pgBrowser, Backbone, Backgrid, CodeMirror, Backform ) {

View File

@ -1,6 +1,6 @@
define([ define([
'sources/gettext', 'sources/url_for' ,'jquery', 'underscore', 'underscore.string', 'pgadmin.alertifyjs', 'sources/gettext', 'sources/url_for' ,'jquery', 'underscore', 'underscore.string', 'pgadmin.alertifyjs',
'pgadmin','pgadmin.browser', 'backbone', 'backgrid', 'sources/../bundle/codemirror', 'backform', 'sources/pgadmin','pgadmin.browser', 'backbone', 'backgrid', 'sources/../bundle/codemirror', 'backform',
'pgadmin.tools.debugger.ui', 'pgadmin.tools.debugger.ui',
'wcdocker', 'pgadmin.backform', 'wcdocker', 'pgadmin.backform',
'pgadmin.backgrid' 'pgadmin.backgrid'

View File

@ -1,6 +1,6 @@
define([ define([
'sources/gettext', 'sources/url_for', 'jquery', 'underscore', 'underscore.string', 'pgadmin.alertifyjs', 'sources/gettext', 'sources/url_for', 'jquery', 'underscore', 'underscore.string', 'pgadmin.alertifyjs',
'pgadmin', 'pgadmin.browser', 'backbone', 'backgrid', 'backform', 'sources/pgadmin', 'pgadmin.browser', 'backbone', 'backgrid', 'backform',
'pgadmin.backform', 'pgadmin.backgrid', 'pgadmin.browser.node.ui' 'pgadmin.backform', 'pgadmin.backgrid', 'pgadmin.browser.node.ui'
], function( ], function(
gettext, url_for, $, _, S, Alertify, pgAdmin, pgBrowser, Backbone, Backgrid, Backform gettext, url_for, $, _, S, Alertify, pgAdmin, pgBrowser, Backbone, Backgrid, Backform

View File

@ -1,6 +1,6 @@
define([ define([
'sources/gettext', 'sources/url_for', 'jquery', 'underscore', 'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
'underscore.string', 'pgadmin.alertifyjs', 'pgadmin', 'pgadmin.browser', 'backbone', 'underscore.string', 'pgadmin.alertifyjs', 'sources/pgadmin', 'pgadmin.browser', 'backbone',
'backgrid', 'backform', 'backgrid', 'backform',
'pgadmin.backform', 'pgadmin.backgrid', 'pgadmin.backform', 'pgadmin.backgrid',
'pgadmin.browser.node.ui' 'pgadmin.browser.node.ui'

View File

@ -1,7 +1,7 @@
define('tools.querytool', [ define('tools.querytool', [
'babel-polyfill', 'sources/gettext','sources/url_for', 'jquery', 'babel-polyfill', 'sources/gettext','sources/url_for', 'jquery',
'underscore', 'underscore.string', 'pgadmin.alertifyjs', 'underscore', 'underscore.string', 'pgadmin.alertifyjs',
'pgadmin', 'backbone', 'sources/../bundle/codemirror', 'sources/pgadmin', 'backbone', 'sources/../bundle/codemirror',
'pgadmin.misc.explain', 'pgadmin.misc.explain',
'sources/selection/grid_selector', 'sources/selection/grid_selector',
'sources/selection/active_cell_capture', 'sources/selection/active_cell_capture',

View File

@ -120,7 +120,7 @@ var webpackShimConfig = {
'bundled_browser': path.join(__dirname, './pgadmin/static/bundle/browser'), 'bundled_browser': path.join(__dirname, './pgadmin/static/bundle/browser'),
'sources': path.join(__dirname, './pgadmin/static/js'), 'sources': path.join(__dirname, './pgadmin/static/js'),
'pgadmin': path.join(__dirname, './pgadmin/static/js/pgadmin'), 'pgadmin': path.join(__dirname, './pgadmin/static/js/pgadmin'),
'tools.translations': path.join(__dirname, './pgadmin/tools/templates/js/translations'), 'translations': path.join(__dirname, './pgadmin/tools/templates/js/translations'),
'sources/gettext': path.join(__dirname, './pgadmin/static/js/gettext'), 'sources/gettext': path.join(__dirname, './pgadmin/static/js/gettext'),
'babel-polyfill': path.join(__dirname, './node_modules/babel-polyfill/dist/polyfill'), 'babel-polyfill': path.join(__dirname, './node_modules/babel-polyfill/dist/polyfill'),
@ -137,6 +137,7 @@ var webpackShimConfig = {
'jquery.contextmenu': path.join(__dirname, './node_modules/jquery-contextmenu/dist/jquery.contextMenu'), 'jquery.contextmenu': path.join(__dirname, './node_modules/jquery-contextmenu/dist/jquery.contextMenu'),
'dropzone': path.join(__dirname, './node_modules/dropzone/dist/dropzone'), 'dropzone': path.join(__dirname, './node_modules/dropzone/dist/dropzone'),
'bignumber': path.join(__dirname, './node_modules/bignumber.js/bignumber'), 'bignumber': path.join(__dirname, './node_modules/bignumber.js/bignumber'),
'snap.svg': path.join(__dirname, './node_modules/snapsvg/dist/snap.svg'),
// AciTree // AciTree
'jquery.acitree': path.join(__dirname, './node_modules/acitree/js/jquery.aciTree.min'), 'jquery.acitree': path.join(__dirname, './node_modules/acitree/js/jquery.aciTree.min'),
@ -175,7 +176,6 @@ var webpackShimConfig = {
'pgadmin.node.catalog': path.join(__dirname, './pgadmin/browser/server_groups/servers/databases/schemas/static/js/catalog'), 'pgadmin.node.catalog': path.join(__dirname, './pgadmin/browser/server_groups/servers/databases/schemas/static/js/catalog'),
'pgadmin.node.role': path.join(__dirname, './pgadmin/browser/server_groups/servers/roles/static/js/role'), 'pgadmin.node.role': path.join(__dirname, './pgadmin/browser/server_groups/servers/roles/static/js/role'),
'pgadmin.node.check_constraint': path.join(__dirname, './pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint'), 'pgadmin.node.check_constraint': path.join(__dirname, './pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint'),
'translations': '/tools/translations',
'pgadmin.node.user_mapping': path.join(__dirname, './pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/static/js/user_mapping'), 'pgadmin.node.user_mapping': path.join(__dirname, './pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/static/js/user_mapping'),
'pgadmin.browser.messages': '/browser/js/messages', 'pgadmin.browser.messages': '/browser/js/messages',
'pgadmin.node.collation': path.join(__dirname, './pgadmin/browser/server_groups/servers/databases/schemas/collations/static/js/collation'), 'pgadmin.node.collation': path.join(__dirname, './pgadmin/browser/server_groups/servers/databases/schemas/collations/static/js/collation'),
@ -202,7 +202,7 @@ var webpackShimConfig = {
'pgadmin.browser.object_sql': path.join(__dirname, './pgadmin/misc/sql/static/js/sql'), 'pgadmin.browser.object_sql': path.join(__dirname, './pgadmin/misc/sql/static/js/sql'),
'pgadmin.preferences': path.join(__dirname, './pgadmin/preferences/static/js/preferences'), 'pgadmin.preferences': path.join(__dirname, './pgadmin/preferences/static/js/preferences'),
'pgadmin.node.domain_constraints': path.join(__dirname, './pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/static/js/domain_constraints'), 'pgadmin.node.domain_constraints': path.join(__dirname, './pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/static/js/domain_constraints'),
'slick.pgadmin.formatters': path.join(__dirname, './pgadmin/tools/../static/js/slickgrid/slick.pgadmin.formatters'), 'slick.pgadmin.formatters': path.join(__dirname, './pgadmin/tools/../static/js/slickgrid/formatters'),
'pgadmin.node.catalog_object': path.join(__dirname, './pgadmin/browser/server_groups/servers/databases/schemas/catalog_objects/static/js/catalog_object'), 'pgadmin.node.catalog_object': path.join(__dirname, './pgadmin/browser/server_groups/servers/databases/schemas/catalog_objects/static/js/catalog_object'),
'pgadmin.dashboard': path.join(__dirname, './pgadmin/dashboard/static/js/dashboard'), 'pgadmin.dashboard': path.join(__dirname, './pgadmin/dashboard/static/js/dashboard'),
'pgadmin.node.foreign_data_wrapper': path.join(__dirname, './pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/static/js/foreign_data_wrapper'), 'pgadmin.node.foreign_data_wrapper': path.join(__dirname, './pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/static/js/foreign_data_wrapper'),
@ -243,7 +243,7 @@ var webpackShimConfig = {
'pgadmin.node.fts_parser': path.join(__dirname, './pgadmin/browser/server_groups/servers/databases/schemas/fts_parser/static/js/fts_parser'), 'pgadmin.node.fts_parser': path.join(__dirname, './pgadmin/browser/server_groups/servers/databases/schemas/fts_parser/static/js/fts_parser'),
'pgadmin.browser.utils': '/browser/js/utils', 'pgadmin.browser.utils': '/browser/js/utils',
'pgadmin.about': path.join(__dirname, './pgadmin/about/static/js/about'), 'pgadmin.about': path.join(__dirname, './pgadmin/about/static/js/about'),
'slick.pgadmin.editors': path.join(__dirname, './pgadmin/tools/../static/js/slickgrid/slick.pgadmin.editors'), 'slick.pgadmin.editors': path.join(__dirname, './pgadmin/tools/../static/js/slickgrid/editors'),
'pgadmin.node.column': path.join(__dirname, './pgadmin/browser/server_groups/servers/databases/schemas/tables/column/static/js/column'), 'pgadmin.node.column': path.join(__dirname, './pgadmin/browser/server_groups/servers/databases/schemas/tables/column/static/js/column'),
'pgadmin.node.foreign_table': path.join(__dirname, './pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/static/js/foreign_table'), 'pgadmin.node.foreign_table': path.join(__dirname, './pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/static/js/foreign_table'),
'pgadmin.node.fts_dictionary': path.join(__dirname, './pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/static/js/fts_dictionary'), 'pgadmin.node.fts_dictionary': path.join(__dirname, './pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/static/js/fts_dictionary'),