"),
+ td = $("| ", {class: 'editable sortable renderable', style: 'height: auto', colspan: noofcol+2}).appendTo(tr);
+
+ noofcol = noofcol || 1;
+ // Handle close and save events
+ $dialog.find('button.cancel').click(function(e) {
+ e.preventDefault();
+ editor1.cancel();
+ tr.remove();
+ return false;
+ });
+ $dialog.find('button.save').click(function(e) {
+ e.preventDefault();
+ editor1.save();
+ tr.remove();
+ return false;
+ });
+
+ // Show the Bootstrap modal dialog
+ td.append($dialog.css('display', 'block'));
+ this.el.parent('tr').after(tr);
+
+ return $dialog;
+ },
+ save: function(options) {
+ options || (options = {});
+ var model = this.origModel,
+ column = this.column,
+ objectModel = this.model,
+ $form = this.$dialog.find('form');
+
+ // Retrieve values from the form, and store inside the object model
+ var changes = {};
+ _.each(this.schema, function(field) {
+ inputType = (field.control == 'datepicker' ? 'input' : field.control);
+ val = $form.find(inputType + '[name='+field.name+']').first().val()
+ val = (field.cell == 'integer') ? parseInt(val) :
+ (field.cell == 'number') ? parseFloat(val) : val
+
+ changes[field.name] = val;
+ });
+
+ objectModel.set(changes);
+ model.set(changes, options);
+
+ model.trigger("backgrid:edited", model, column, new Backgrid.Command({keyCode:13}));
+
+ return this;
+ },
+ cancel: function() {
+ this.origModel.trigger("backgrid:edited", this.origModel, this.column, new Backgrid.Command({keyCode:27}));
+ return this;
+ },
+ remove: function() {
+ this.$dialog.modal("hide").remove();
+ Backgrid.CellEditor.prototype.remove.apply(this, arguments);
+ return this;
+ }
+ });
+
+ var PGSelectCell = Backgrid.Extension.PGSelectCell = Backgrid.SelectCell.extend({
+ // It's possible to render an option group or use a
+ // function to provide option values too.
+ optionValues: function() {
+ var res = [];
+ opts = _.result(this.column.attributes, 'options');
+ _.each(opts, function(o) {
+ res.push([o.label, o.value]);
+ });
+ return res;
+ }
+ });
+
+ var ObjectCell = Backgrid.Extension.ObjectCell = Backgrid.Cell.extend({
+ editorOptionDefaults: {
+ schema: []
+ },
+ className: "edit-cell",
+ editor: ObjectCellEditor,
+ initialize: function(options) {
+ Backgrid.Cell.prototype.initialize.apply(this, arguments);
+
+ // Pass on cell options to the editor
+ var cell = this,
+ editorOptions = {};
+ _.each(this.editorOptionDefaults, function(def, opt) {
+ if (!cell[opt]) cell[opt] = def;
+ if (options && options[opt]) cell[opt] = options[opt];
+ editorOptions[opt] = cell[opt];
+ });
+
+ editorOptions['el'] = $(this.el);
+ editorOptions['columns_length'] = this.column.collection.length
+
+ this.listenTo(this.model, "backgrid:edit", function (model, column, cell, editor) {
+ if (column.get("name") == this.column.get("name"))
+ editor.extendWithOptions(editorOptions);
+ });
+ },
+ enterEditMode: function () {
+ var $content = this.$el.html();
+ Backgrid.Cell.prototype.enterEditMode.apply(this, arguments);
+ var editable = Backgrid.callByNeed(this.column.editable(), this.column, this.model);
+ if (editable) this.$el.html("");
+ },
+ render: function(){
+ this.$el.empty();
+ this.$el.html("");
+ this.delegateEvents();
+ return this;
+ }
+ });
+
+ var DeleteCell = Backgrid.Extension.DeleteCell = Backgrid.Cell.extend({
+ /** @property */
+ className: "delete-cell",
+ events: {
+ "click": "deleteRow"
+ },
+ deleteRow: function (e) {
+ e.preventDefault();
+ that = this;
+ Alertify.confirm(
+ 'Delete Row',
+ 'Are You Sure, you want to delete this object?',
+ function(evt) {
+ that.model.collection.remove(that.model);
+ },
+ function(evt) {
+ return true;
+ }
+ );
+ },
+ initialize: function () {
+ Backgrid.Cell.prototype.initialize.apply(this, arguments);
+ },
+ render: function () {
+ this.$el.empty();
+ this.$el.html("");
+ this.delegateEvents();
+ return this;
+ }
+ });
+
+ return Backgrid;
+
+}));
diff --git a/web/pgadmin/static/js/bootstrap-datepicker.js b/web/pgadmin/static/js/bootstrap-datepicker.js
index 1a183e239..11fedaf08 100644
--- a/web/pgadmin/static/js/bootstrap-datepicker.js
+++ b/web/pgadmin/static/js/bootstrap-datepicker.js
@@ -1,10 +1,18 @@
/*!
- * Datepicker for Bootstrap v1.5.0-dev (https://github.com/eternicode/bootstrap-datepicker)
+ * Datepicker for Bootstrap v1.5.0 (https://github.com/eternicode/bootstrap-datepicker)
*
* Copyright 2012 Stefan Petre
* Improvements by Andrew Rowls
* Licensed under the Apache License v2.0 (http://www.apache.org/licenses/LICENSE-2.0)
- */(function($, undefined){
+ */(function(factory){
+ if (typeof define === "function" && define.amd) {
+ define(["jquery"], factory);
+ } else if (typeof exports === 'object') {
+ factory(require('jquery'));
+ } else {
+ factory(jQuery);
+ }
+}(function($, undefined){
function UTCDate(){
return new Date(Date.UTC.apply(Date, arguments));
@@ -25,6 +33,9 @@
return this[method].apply(this, arguments);
};
}
+ function isValidDate(d) {
+ return d && !isNaN(d.getTime());
+ }
var DateArray = (function(){
var extras = {
@@ -115,6 +126,7 @@
this.setStartDate(this._o.startDate);
this.setEndDate(this._o.endDate);
this.setDaysOfWeekDisabled(this.o.daysOfWeekDisabled);
+ this.setDaysOfWeekHighlighted(this.o.daysOfWeekHighlighted);
this.setDatesDisabled(this.o.datesDisabled);
this.fillDow();
@@ -175,6 +187,20 @@
o.minViewMode = 0;
}
+ switch (o.maxViewMode) {
+ case 0:
+ case 'days':
+ o.maxViewMode = 0;
+ break;
+ case 1:
+ case 'months':
+ o.maxViewMode = 1;
+ break;
+ default:
+ o.maxViewMode = 2;
+ }
+
+ o.startView = Math.min(o.startView, o.maxViewMode);
o.startView = Math.max(o.startView, o.minViewMode);
// true, false, or Number > 0
@@ -219,6 +245,13 @@
return parseInt(d, 10);
});
+ o.daysOfWeekHighlighted = o.daysOfWeekHighlighted||[];
+ if (!$.isArray(o.daysOfWeekHighlighted))
+ o.daysOfWeekHighlighted = o.daysOfWeekHighlighted.split(/[,\s]*/);
+ o.daysOfWeekHighlighted = $.map(o.daysOfWeekHighlighted, function(d){
+ return parseInt(d, 10);
+ });
+
o.datesDisabled = o.datesDisabled||[];
if (!$.isArray(o.datesDisabled)) {
var datesDisabled = [];
@@ -269,6 +302,7 @@
o.defaultViewDate = UTCToday();
}
o.showOnFocus = o.showOnFocus !== undefined ? o.showOnFocus : true;
+ o.zIndexOffset = o.zIndexOffset !== undefined ? o.zIndexOffset : 10;
},
_events: [],
_secondaryEvents: [],
@@ -376,9 +410,10 @@
this.element.is(e.target) ||
this.element.find(e.target).length ||
this.picker.is(e.target) ||
- this.picker.find(e.target).length
+ this.picker.find(e.target).length ||
+ this.picker.hasClass('datepicker-inline')
)){
- $(this.picker).hide();
+ this.hide();
}
}, this)
}]
@@ -534,7 +569,7 @@
}
if (element) {
- element.val('').change();
+ element.val('');
}
this.update();
@@ -567,11 +602,11 @@
var formatted = this.getFormattedDate();
if (!this.isInput){
if (this.component){
- this.element.find('input').val(formatted).change();
+ this.element.find('input').val(formatted);
}
}
else {
- this.element.val(formatted).change();
+ this.element.val(formatted);
}
return this;
},
@@ -607,6 +642,12 @@
return this;
},
+ setDaysOfWeekHighlighted: function(daysOfWeekHighlighted){
+ this._process_options({daysOfWeekHighlighted: daysOfWeekHighlighted});
+ this.update();
+ return this;
+ },
+
setDatesDisabled: function(datesDisabled){
this._process_options({datesDisabled: datesDisabled});
this.update();
@@ -619,17 +660,17 @@
var calendarWidth = this.picker.outerWidth(),
calendarHeight = this.picker.outerHeight(),
visualPadding = 10,
- windowWidth = $(this.o.container).width(),
- windowHeight = $(this.o.container).height(),
- scrollTop = $(this.o.container).scrollTop(),
- appendOffset = $(this.o.container).offset();
+ container = $(this.o.container),
+ windowWidth = container.width(),
+ scrollTop = container.scrollTop(),
+ appendOffset = container.offset();
var parentsZindex = [];
this.element.parents().each(function(){
var itemZIndex = $(this).css('z-index');
if (itemZIndex !== 'auto' && itemZIndex !== 0) parentsZindex.push(parseInt(itemZIndex));
});
- var zIndex = Math.max.apply(Math, parentsZindex) + 10;
+ var zIndex = Math.max.apply(Math, parentsZindex) + this.o.zIndexOffset;
var offset = this.component ? this.component.parent().offset() : this.element.offset();
var height = this.component ? this.component.outerHeight(true) : this.element.outerHeight(false);
var width = this.component ? this.component.outerWidth(true) : this.element.outerWidth(false);
@@ -666,20 +707,17 @@
// auto y orientation is best-situation: top or bottom, no fudging,
// decision based on which shows more of the calendar
var yorient = this.o.orientation.y,
- top_overflow, bottom_overflow;
+ top_overflow;
if (yorient === 'auto'){
top_overflow = -scrollTop + top - calendarHeight;
- bottom_overflow = scrollTop + windowHeight - (top + height + calendarHeight);
- if (Math.max(top_overflow, bottom_overflow) === bottom_overflow)
- yorient = 'top';
- else
- yorient = 'bottom';
+ yorient = top_overflow < 0 ? 'bottom' : 'top';
}
+
this.picker.addClass('datepicker-orient-' + yorient);
if (yorient === 'top')
- top += height;
- else
top -= calendarHeight + parseInt(this.picker.css('padding-top'));
+ else
+ top += height;
if (this.o.rtl) {
var right = windowWidth - (left + width);
@@ -743,6 +781,8 @@
this.viewDate = new Date(this.o.startDate);
else if (this.viewDate > this.o.endDate)
this.viewDate = new Date(this.o.endDate);
+ else
+ this.viewDate = this.o.defaultViewDate;
if (fromArgs){
// setting date by clicking
@@ -757,6 +797,7 @@
this._trigger('clearDate');
this.fill();
+ this.element.change();
return this;
},
@@ -764,12 +805,11 @@
var dowCnt = this.o.weekStart,
html = ' |