Shim all external dependencies

Even if global they can be addressed and replaced further ahead
pull/1288/head
Nicklas Gummesson 10 years ago
parent ade2d24ccb
commit 4071c19943

@ -1,12 +1,11 @@
var React = require('react'); var React = require('react');
var TableView = require('table/table_view/react_component'); var TableView = require('table/table_view/react_component');
var GlobalError = require('global_error/view'); var GlobalError = require('global_error/view');
var cdb = require('cartodbui');
// Mimic the original cdb.admin.TableView, so this replacement can act as a seamless replacement to render the table // Mimic the original cdb.admin.TableView, so this replacement can act as a seamless replacement to render the table
// view, isolating the React rendering code to this view only. // view, isolating the React rendering code to this view only.
cdb.admin.TableView = function(args) { cdb.admin.TableView = function(args) {
window.dataModel = args.dataModel;
// The actual render call is not working, so don't use... // The actual render call is not working, so don't use...
this.render = function() { this.render = function() {
if (!this.el) { if (!this.el) {

@ -1,3 +1,7 @@
var _ = require('underscore');
var cdb = require('cartodb.js');
// Extracted from cdb/ui/common/table.js, since the notifications should depend on the changes triggered by // Extracted from cdb/ui/common/table.js, since the notifications should depend on the changes triggered by
// models/collections, not a view. // models/collections, not a view.
module.exports = cdb.core.View.extend({ module.exports = cdb.core.View.extend({

@ -1,6 +1,7 @@
/** @jsx React.DOM */ /** @jsx React.DOM */
var ModelMixin = require('react/model_mixin'); var ModelMixin = require('react/model_mixin');
var React = require('react'); var React = require('react');
var $ = require('jquery');
module.exports = React.createClass({ module.exports = React.createClass({
mixins:[ModelMixin], mixins:[ModelMixin],

@ -3,7 +3,7 @@ var ModelMixin = require('react/model_mixin');
var React = require('react'); var React = require('react');
var ColumnHeader = require('table/table_view/column_header/react_component'); var ColumnHeader = require('table/table_view/column_header/react_component');
var Row = require('table/table_view/row/react_component'); var Row = require('table/table_view/row/react_component');
var $ = require('jquery');
module.exports = React.createClass({ module.exports = React.createClass({
mixins:[ModelMixin], mixins:[ModelMixin],

@ -1,3 +1,5 @@
var _ = require('underscore');
// from row_view.js, should really be extracted to value object, or consolidated to appropriate model. // from row_view.js, should really be extracted to value object, or consolidated to appropriate model.
module.exports = function(table, value) { module.exports = function(table, value) {
function geomDisplayValue(value) { function geomDisplayValue(value) {

@ -1,8 +1,11 @@
// TODO: extracted from table/tableview.js and adapted to not be too tied to parent backbone view, most of it should var _ = require('underscore');
// really be in the cdb.admin.SmallEditorDialog since it's sole purpose is to handle the cell editing. var $ = require('jquery');
var cdb = require('cartodbui');
var currentCellEditorDialog; var currentCellEditorDialog;
// TODO: extracted from table/tableview.js and adapted to not be too tied to parent backbone view, most of it should
// really be in the cdb.admin.SmallEditorDialog since it's sole purpose is to handle the cell editing.
var getEditor = function(columnType) { var getEditor = function(columnType) {
var editors = { var editors = {
'string': cdb.admin.StringField, 'string': cdb.admin.StringField,

@ -3,6 +3,7 @@ var ModelMixin = require('react/model_mixin');
var React = require('react'); var React = require('react');
var getGeometryValue = require('table/table_view/row/get_geometry_value'); var getGeometryValue = require('table/table_view/row/get_geometry_value');
var openCellEditorDialog = require('table/table_view/row/open_cell_editor_dialog'); var openCellEditorDialog = require('table/table_view/row/open_cell_editor_dialog');
var cdb = require('cartodbui');
module.exports = React.createClass({ module.exports = React.createClass({
mixins:[ModelMixin], mixins:[ModelMixin],

@ -50,5 +50,16 @@
}, },
"files": [ "files": [
"dist" "dist"
] ],
"browserify": {
"transform": [
"browserify-shim"
]
},
"browserify-shim": {
"jquery": "global:$",
"underscore": "global:_",
"cartodbui": "global:cdb",
"cartodb.js": "global:cdb"
}
} }

Loading…
Cancel
Save