Skip to content

Commit 88a41a1

Browse files
author
roguejenkins
committed
jenkins job django-maploom: use latest maploom to build maploom django wrapper.
1 parent 7ec2d57 commit 88a41a1

File tree

3 files changed

+58
-27
lines changed

3 files changed

+58
-27
lines changed

maploom/static/maploom/assets/MapLoom-1.0.0.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

maploom/static/maploom/assets/MapLoom-1.0.0.js

Lines changed: 56 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* MapLoom - v1.0.0 - 2014-11-12
2+
* MapLoom - v1.0.0 - 2014-12-04
33
* http://www.lmnsolutions.com
44
*
55
* Copyright (c) 2014 LMN Solutions
@@ -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,
3123331233
(function ($) {
3123431234

3123531235
var $document = $(document),
31236-
bsSort = [],
31237-
lastSort,
3123831236
signClass;
3123931237

3124031238
$.bootstrapSortable = function (applyLast, sign) {
@@ -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,
3124731245

3124831246
// set attributes needed for sorting
3124931247
$('table.sortable').each(function () {
31250-
var $this = $(this);
31248+
var $this = $(this),
31249+
context = lookupSortContext($this),
31250+
bsSort = context.bsSort;
3125131251
applyLast = (applyLast === true);
3125231252
$this.find('span.sign').remove();
3125331253
$this.find('thead tr').each(function (rowIndex) {
3125431254
var columnsSkipped = 0;
3125531255
$(this).find('th').each(function (columnIndex) {
3125631256
var $this = $(this);
31257+
$this.addClass('nosort').removeClass('up down');
3125731258
$this.attr('data-sortcolumn', columnIndex + columnsSkipped);
3125831259
$this.attr('data-sortkey', columnIndex + '-' + rowIndex);
3125931260
if ($this.attr("colspan") !== undefined) {
@@ -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,
3126331264
});
3126431265
$this.find('td').each(function () {
3126531266
var $this = $(this);
31266-
if ($this.attr('data-dateformat') != undefined && momentJsAvailable) {
31267+
if ($this.attr('data-dateformat') !== undefined && momentJsAvailable) {
3126731268
$this.attr('data-value', moment($this.text(), $this.attr('data-dateformat')).format('YYYY/MM/DD/HH/mm/ss'));
3126831269
}
3126931270
else {
@@ -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,
3127531276
var $sortTable = $this.closest('table.sortable');
3127631277
$this.data('sortTable', $sortTable);
3127731278
var sortKey = $this.attr('data-sortkey');
31278-
var thisLastSort = applyLast ? lastSort : -1;
31279+
var thisLastSort = applyLast ? context.lastSort : -1;
3127931280
bsSort[sortKey] = applyLast ? bsSort[sortKey] : $this.attr('data-defaultsort');
31280-
if (bsSort[sortKey] != null && (applyLast == (sortKey == thisLastSort))) {
31281-
bsSort[sortKey] = bsSort[sortKey] == 'asc' ? 'desc' : 'asc';
31281+
if (bsSort[sortKey] !== undefined && (applyLast === (sortKey === thisLastSort))) {
31282+
bsSort[sortKey] = bsSort[sortKey] === 'asc' ? 'desc' : 'asc';
3128231283
doSort($this, $sortTable);
3128331284
}
3128431285
});
@@ -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,
3129331294
$table.trigger('sorted');
3129431295
});
3129531296

31297+
// Look up sorting data appropriate for the specified table (jQuery element).
31298+
// This allows multiple tables on one page without collisions.
31299+
function lookupSortContext($table) {
31300+
var context = $table.data("bootstrap-sortable-context");
31301+
if(context == null) {
31302+
context = { bsSort: [], lastSort: null };
31303+
$table.data("bootstrap-sortable-context", context);
31304+
}
31305+
return context;
31306+
}
31307+
3129631308
//Sorting mechanism separated
3129731309
function doSort($this, $table) {
31298-
var sortColumn = $this.attr('data-sortcolumn');
31310+
var sortColumn = $this.attr('data-sortcolumn'),
31311+
context = lookupSortContext($table),
31312+
bsSort = context.bsSort;
3129931313

3130031314
var colspan = $this.attr('colspan');
3130131315
if (colspan) {
@@ -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,
3131431328
var localSignClass = $this.attr('data-defaultsign') || signClass;
3131531329

3131631330
// update arrow icon
31331+
$table.find('th').each(function() {
31332+
$(this).removeClass('up').removeClass('down').addClass('nosort');
31333+
});
31334+
3131731335
if ($.browser.mozilla) {
3131831336
var moz_arrow = $table.find('div.mozilla');
31319-
if (moz_arrow != null) {
31337+
if (moz_arrow !== undefined) {
3132031338
moz_arrow.find('.sign').remove();
3132131339
moz_arrow.parent().html(moz_arrow.html());
3132231340
}
@@ -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,
3133031348

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

31335-
lastSort = sortKey;
31336-
bsSort[sortKey] = (bsSort[sortKey] || initialDirection) == 'asc' ? 'desc' : 'asc';
31337-
if (bsSort[sortKey] == 'desc') { $this.find('span.sign').addClass('up'); }
31353+
context.lastSort = sortKey;
31354+
bsSort[sortKey] = (bsSort[sortKey] || initialDirection) === 'asc' ? 'desc' : 'asc';
31355+
if (bsSort[sortKey] === 'desc') {
31356+
$this.find('span.sign').addClass('up');
31357+
$this.addClass('up').removeClass('down nosort');
31358+
} else {
31359+
$this.addClass('down').removeClass('up nosort');
31360+
}
3133831361

3133931362
// sort rows
31340-
var rows = $table.find('tbody tr');
31363+
var rows = $table.children('tbody').children('tr');
3134131364
rows.tsort('td:eq(' + sortColumn + ')', { order: bsSort[sortKey], attr: 'data-value' });
31365+
31366+
// add class to sorted column cells
31367+
$table.find('td.sorted, th.sorted').removeClass('sorted');
31368+
rows.find('td:eq(' + sortColumn + ')').addClass('sorted');
31369+
$this.addClass('sorted');
3134231370
}
3134331371

3134431372
// jQuery 1.9 removed this object
@@ -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,
3134731375
var ua = navigator.userAgent;
3134831376
$.each($.browser, function (c) {
3134931377
$.browser[c] = ((new RegExp(c, 'i').test(ua))) ? true : false;
31350-
if ($.browser.mozilla && c == 'mozilla') { $.browser.mozilla = ((new RegExp('firefox', 'i').test(ua))) ? true : false; }
31351-
if ($.browser.chrome && c == 'safari') { $.browser.safari = false; }
31378+
if ($.browser.mozilla && c === 'mozilla') { $.browser.mozilla = ((new RegExp('firefox', 'i').test(ua))) ? true : false; }
31379+
if ($.browser.chrome && c === 'safari') { $.browser.safari = false; }
3135231380
});
3135331381
}
3135431382

@@ -35559,14 +35587,17 @@ var DiffColorMap = {
3555935587
return selectedItem_;
3556035588
};
3556135589
this.getSelectedItemPics = function () {
35562-
var picStrings = [];
35563-
goog.array.forEach(selectedItemPics_.pics, function (item, index) {
35564-
if (goog.isObject(item)) {
35565-
picStrings[index] = item.modified;
35566-
} else {
35567-
picStrings[index] = item;
35568-
}
35569-
});
35590+
var picStrings = null;
35591+
if (goog.isDefAndNotNull(selectedItemPics_)) {
35592+
picStrings = [];
35593+
goog.array.forEach(selectedItemPics_.pics, function (item, index) {
35594+
if (goog.isObject(item)) {
35595+
picStrings[index] = item.modified;
35596+
} else {
35597+
picStrings[index] = item;
35598+
}
35599+
});
35600+
}
3557035601
return picStrings;
3557135602
};
3557235603
this.getSelectedItemProperties = function () {

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

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

0 commit comments

Comments
 (0)