Skip to content

Commit

Permalink
jenkins job django-maploom: use latest maploom to build maploom djang…
Browse files Browse the repository at this point in the history 
…o wrapper.
  • Loading branch information
roguejenkins committed Dec 5, 2014
1 parent 7ec2d57 commit 88a41a1
Show file tree
Hide file tree
Showing 3 changed files with 58 additions and 27 deletions.
2 changes: 1 addition & 1 deletion maploom/static/maploom/assets/MapLoom-1.0.0.css
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

81 changes: 56 additions & 25 deletions maploom/static/maploom/assets/MapLoom-1.0.0.js
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* MapLoom - v1.0.0 - 2014-11-12
* MapLoom - v1.0.0 - 2014-12-04
* http://www.lmnsolutions.com
*
* Copyright (c) 2014 LMN Solutions
Expand Down Expand Up @@ -31233,8 +31233,6 @@ return c>=ys?n?"M0,"+i+"A"+i+","+i+" 0 1,1 0,"+-i+"A"+i+","+i+" 0 1,1 0,"+i+"M0,
(function ($) {

var $document = $(document),
bsSort = [],
lastSort,
signClass;

$.bootstrapSortable = function (applyLast, sign) {
Expand All @@ -31247,13 +31245,16 @@ return c>=ys?n?"M0,"+i+"A"+i+","+i+" 0 1,1 0,"+-i+"A"+i+","+i+" 0 1,1 0,"+i+"M0,

// set attributes needed for sorting
$('table.sortable').each(function () {
var $this = $(this);
var $this = $(this),
context = lookupSortContext($this),
bsSort = context.bsSort;
applyLast = (applyLast === true);
$this.find('span.sign').remove();
$this.find('thead tr').each(function (rowIndex) {
var columnsSkipped = 0;
$(this).find('th').each(function (columnIndex) {
var $this = $(this);
$this.addClass('nosort').removeClass('up down');
$this.attr('data-sortcolumn', columnIndex + columnsSkipped);
$this.attr('data-sortkey', columnIndex + '-' + rowIndex);
if ($this.attr("colspan") !== undefined) {
Expand All @@ -31263,7 +31264,7 @@ return c>=ys?n?"M0,"+i+"A"+i+","+i+" 0 1,1 0,"+-i+"A"+i+","+i+" 0 1,1 0,"+i+"M0,
});
$this.find('td').each(function () {
var $this = $(this);
if ($this.attr('data-dateformat') != undefined && momentJsAvailable) {
if ($this.attr('data-dateformat') !== undefined && momentJsAvailable) {
$this.attr('data-value', moment($this.text(), $this.attr('data-dateformat')).format('YYYY/MM/DD/HH/mm/ss'));
}
else {
Expand All @@ -31275,10 +31276,10 @@ return c>=ys?n?"M0,"+i+"A"+i+","+i+" 0 1,1 0,"+-i+"A"+i+","+i+" 0 1,1 0,"+i+"M0,
var $sortTable = $this.closest('table.sortable');
$this.data('sortTable', $sortTable);
var sortKey = $this.attr('data-sortkey');
var thisLastSort = applyLast ? lastSort : -1;
var thisLastSort = applyLast ? context.lastSort : -1;
bsSort[sortKey] = applyLast ? bsSort[sortKey] : $this.attr('data-defaultsort');
if (bsSort[sortKey] != null && (applyLast == (sortKey == thisLastSort))) {
bsSort[sortKey] = bsSort[sortKey] == 'asc' ? 'desc' : 'asc';
if (bsSort[sortKey] !== undefined && (applyLast === (sortKey === thisLastSort))) {
bsSort[sortKey] = bsSort[sortKey] === 'asc' ? 'desc' : 'asc';
doSort($this, $sortTable);
}
});
Expand All @@ -31293,9 +31294,22 @@ return c>=ys?n?"M0,"+i+"A"+i+","+i+" 0 1,1 0,"+-i+"A"+i+","+i+" 0 1,1 0,"+i+"M0,
$table.trigger('sorted');
});

// Look up sorting data appropriate for the specified table (jQuery element).
// This allows multiple tables on one page without collisions.
function lookupSortContext($table) {
var context = $table.data("bootstrap-sortable-context");
if(context == null) {
context = { bsSort: [], lastSort: null };
$table.data("bootstrap-sortable-context", context);
}
return context;
}

//Sorting mechanism separated
function doSort($this, $table) {
var sortColumn = $this.attr('data-sortcolumn');
var sortColumn = $this.attr('data-sortcolumn'),
context = lookupSortContext($table),
bsSort = context.bsSort;

var colspan = $this.attr('colspan');
if (colspan) {
Expand All @@ -31314,9 +31328,13 @@ return c>=ys?n?"M0,"+i+"A"+i+","+i+" 0 1,1 0,"+-i+"A"+i+","+i+" 0 1,1 0,"+i+"M0,
var localSignClass = $this.attr('data-defaultsign') || signClass;

// update arrow icon
$table.find('th').each(function() {
$(this).removeClass('up').removeClass('down').addClass('nosort');
});

if ($.browser.mozilla) {
var moz_arrow = $table.find('div.mozilla');
if (moz_arrow != null) {
if (moz_arrow !== undefined) {
moz_arrow.find('.sign').remove();
moz_arrow.parent().html(moz_arrow.html());
}
Expand All @@ -31330,15 +31348,25 @@ return c>=ys?n?"M0,"+i+"A"+i+","+i+" 0 1,1 0,"+-i+"A"+i+","+i+" 0 1,1 0,"+i+"M0,

// sort direction
var sortKey = $this.attr('data-sortkey');
var initialDirection = $this.attr('data-firstsort') != 'desc' ? 'desc' : 'asc';
var initialDirection = $this.attr('data-firstsort') !== 'desc' ? 'desc' : 'asc';

lastSort = sortKey;
bsSort[sortKey] = (bsSort[sortKey] || initialDirection) == 'asc' ? 'desc' : 'asc';
if (bsSort[sortKey] == 'desc') { $this.find('span.sign').addClass('up'); }
context.lastSort = sortKey;
bsSort[sortKey] = (bsSort[sortKey] || initialDirection) === 'asc' ? 'desc' : 'asc';
if (bsSort[sortKey] === 'desc') {
$this.find('span.sign').addClass('up');
$this.addClass('up').removeClass('down nosort');
} else {
$this.addClass('down').removeClass('up nosort');
}

// sort rows
var rows = $table.find('tbody tr');
var rows = $table.children('tbody').children('tr');
rows.tsort('td:eq(' + sortColumn + ')', { order: bsSort[sortKey], attr: 'data-value' });

// add class to sorted column cells
$table.find('td.sorted, th.sorted').removeClass('sorted');
rows.find('td:eq(' + sortColumn + ')').addClass('sorted');
$this.addClass('sorted');
}

// jQuery 1.9 removed this object
Expand All @@ -31347,8 +31375,8 @@ return c>=ys?n?"M0,"+i+"A"+i+","+i+" 0 1,1 0,"+-i+"A"+i+","+i+" 0 1,1 0,"+i+"M0,
var ua = navigator.userAgent;
$.each($.browser, function (c) {
$.browser[c] = ((new RegExp(c, 'i').test(ua))) ? true : false;
if ($.browser.mozilla && c == 'mozilla') { $.browser.mozilla = ((new RegExp('firefox', 'i').test(ua))) ? true : false; }
if ($.browser.chrome && c == 'safari') { $.browser.safari = false; }
if ($.browser.mozilla && c === 'mozilla') { $.browser.mozilla = ((new RegExp('firefox', 'i').test(ua))) ? true : false; }
if ($.browser.chrome && c === 'safari') { $.browser.safari = false; }
});
}

Expand Down Expand Up @@ -35559,14 +35587,17 @@ var DiffColorMap = {
return selectedItem_;
};
this.getSelectedItemPics = function () {
var picStrings = [];
goog.array.forEach(selectedItemPics_.pics, function (item, index) {
if (goog.isObject(item)) {
picStrings[index] = item.modified;
} else {
picStrings[index] = item;
}
});
var picStrings = null;
if (goog.isDefAndNotNull(selectedItemPics_)) {
picStrings = [];
goog.array.forEach(selectedItemPics_.pics, function (item, index) {
if (goog.isObject(item)) {
picStrings[index] = item.modified;
} else {
picStrings[index] = item;
}
});
}
return picStrings;
};
this.getSelectedItemProperties = function () {
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

setup(
name='django-maploom',
version='0.0.1@2014-11-12.14:54:27.f084e85292',
version='0.0.1@2014-12-04.19:57:57.1bf26f78ce',
author='LMN Solutions',
author_email='[email protected]',
url='https://github.com/ROGUE-JCTD/django-maploom',
Expand Down

0 comments on commit 88a41a1

Please sign in to comment.