From 88a41a178fd70e0a6851e9f6962fed43bca72bb8 Mon Sep 17 00:00:00 2001 From: roguejenkins Date: Thu, 4 Dec 2014 19:57:58 -0500 Subject: [PATCH] jenkins job django-maploom: use latest maploom to build maploom django wrapper. --- .../static/maploom/assets/MapLoom-1.0.0.css | 2 +- .../static/maploom/assets/MapLoom-1.0.0.js | 81 +++++++++++++------ setup.py | 2 +- 3 files changed, 58 insertions(+), 27 deletions(-) diff --git a/maploom/static/maploom/assets/MapLoom-1.0.0.css b/maploom/static/maploom/assets/MapLoom-1.0.0.css index 70a05e8..b2db778 100644 --- a/maploom/static/maploom/assets/MapLoom-1.0.0.css +++ b/maploom/static/maploom/assets/MapLoom-1.0.0.css @@ -5,7 +5,7 @@ * Licensed under the Apache License v2.0 * http://www.apache.org/licenses/LICENSE-2.0 * - */.bootstrap-datetimepicker-widget{top:0;left:0;z-index:99999;width:250px;padding:4px;margin-top:1px;border-radius:4px}.bootstrap-datetimepicker-widget .btn{padding:6px}.bootstrap-datetimepicker-widget:before{position:absolute;top:-7px;left:6px;display:inline-block;border-right:7px solid transparent;border-bottom:7px solid #ccc;border-left:7px solid transparent;border-bottom-color:rgba(0,0,0,0.2);content:''}.bootstrap-datetimepicker-widget:after{position:absolute;top:-6px;left:7px;display:inline-block;border-right:6px solid transparent;border-bottom:6px solid #fff;border-left:6px solid transparent;content:''}.bootstrap-datetimepicker-widget.pull-right:before{right:6px;left:auto}.bootstrap-datetimepicker-widget.pull-right:after{right:7px;left:auto}.bootstrap-datetimepicker-widget>ul{margin:0;list-style-type:none}.bootstrap-datetimepicker-widget .timepicker-hour,.bootstrap-datetimepicker-widget .timepicker-minute,.bootstrap-datetimepicker-widget .timepicker-second{width:100%;font-size:1.2em;font-weight:bold}.bootstrap-datetimepicker-widget table[data-hour-format="12"] .separator{width:4px;padding:0;margin:0}.bootstrap-datetimepicker-widget .datepicker>div{display:none}.bootstrap-datetimepicker-widget .picker-switch{text-align:center}.bootstrap-datetimepicker-widget table{width:100%;margin:0}.bootstrap-datetimepicker-widget td,.bootstrap-datetimepicker-widget th{width:20px;height:20px;text-align:center;border-radius:4px}.bootstrap-datetimepicker-widget td.day:hover,.bootstrap-datetimepicker-widget td.hour:hover,.bootstrap-datetimepicker-widget td.minute:hover,.bootstrap-datetimepicker-widget td.second:hover{cursor:pointer;background:#eee}.bootstrap-datetimepicker-widget td.old,.bootstrap-datetimepicker-widget td.new{color:#999}.bootstrap-datetimepicker-widget td.active,.bootstrap-datetimepicker-widget td.active:hover{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#428bca}.bootstrap-datetimepicker-widget td.disabled,.bootstrap-datetimepicker-widget td.disabled:hover{color:#999;cursor:not-allowed;background:0}.bootstrap-datetimepicker-widget td span{display:block;float:left;width:47px;height:54px;margin:2px;line-height:54px;cursor:pointer;border-radius:4px}.bootstrap-datetimepicker-widget td span:hover{background:#eee}.bootstrap-datetimepicker-widget td span.active{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#428bca}.bootstrap-datetimepicker-widget td span.old{color:#999}.bootstrap-datetimepicker-widget td span.disabled,.bootstrap-datetimepicker-widget td span.disabled:hover{color:#999;cursor:not-allowed;background:0}.bootstrap-datetimepicker-widget th.switch{width:145px}.bootstrap-datetimepicker-widget th.next,.bootstrap-datetimepicker-widget th.prev{font-size:21px}.bootstrap-datetimepicker-widget th.disabled,.bootstrap-datetimepicker-widget th.disabled:hover{color:#999;cursor:not-allowed;background:0}.bootstrap-datetimepicker-widget thead tr:first-child th{cursor:pointer}.bootstrap-datetimepicker-widget thead tr:first-child th:hover{background:#eee}.input-group.date .input-group-addon span{display:block;width:16px;height:16px;cursor:pointer}.bootstrap-datetimepicker-widget.left-oriented:before{right:6px;left:auto}.bootstrap-datetimepicker-widget.left-oriented:after{right:7px;left:auto}.bootstrap-datetimepicker-widget ul.list-unstyled li.in div.timepicker div.timepicker-picker table.table-condensed tbody>tr>td{padding:0!important}table.sortable span.sign{position:absolute;top:50%;right:5px;display:block;margin-top:-10px;font-size:12px;color:#bfbfc1}table.sortable span.arrow,span.reversed{width:0;height:0;margin-top:-2px;font-size:0;line-height:0;border-color:#ccc transparent transparent transparent;border-style:solid;border-width:5px}table.sortable span.arrow.up{margin-top:-7px;border-color:transparent transparent #ccc transparent}table.sortable span.reversed{margin-top:-7px;border-color:transparent transparent #ccc transparent}table.sortable span.reversed.up{margin-top:-2px;border-color:#ccc transparent transparent transparent}table.sortable span.az:before{content:"a .. z"}table.sortable span.az.up:before{content:"z .. a"}table.sortable span.AZ:before{content:"A .. Z"}table.sortable span.AZ.up:before{content:"Z .. A"}table.sortable span._19:before{content:"1 .. 9"}table.sortable span._19.up:before{content:"9 .. 1"}table.sortable span.month:before{content:"jan .. dec"}table.sortable span.month.up:before{content:"dec .. jan"}table.sortable thead th:not([data-defaultsort=disabled]){position:relative;top:0;left:0;cursor:pointer}table.sortable thead th:hover:not([data-defaultsort=disabled]){background:#efefef}table.sortable thead th div.mozilla{position:relative}/*! + */.bootstrap-datetimepicker-widget{top:0;left:0;z-index:99999;width:250px;padding:4px;margin-top:1px;border-radius:4px}.bootstrap-datetimepicker-widget .btn{padding:6px}.bootstrap-datetimepicker-widget:before{position:absolute;top:-7px;left:6px;display:inline-block;border-right:7px solid transparent;border-bottom:7px solid #ccc;border-left:7px solid transparent;border-bottom-color:rgba(0,0,0,0.2);content:''}.bootstrap-datetimepicker-widget:after{position:absolute;top:-6px;left:7px;display:inline-block;border-right:6px solid transparent;border-bottom:6px solid #fff;border-left:6px solid transparent;content:''}.bootstrap-datetimepicker-widget.pull-right:before{right:6px;left:auto}.bootstrap-datetimepicker-widget.pull-right:after{right:7px;left:auto}.bootstrap-datetimepicker-widget>ul{margin:0;list-style-type:none}.bootstrap-datetimepicker-widget .timepicker-hour,.bootstrap-datetimepicker-widget .timepicker-minute,.bootstrap-datetimepicker-widget .timepicker-second{width:100%;font-size:1.2em;font-weight:bold}.bootstrap-datetimepicker-widget table[data-hour-format="12"] .separator{width:4px;padding:0;margin:0}.bootstrap-datetimepicker-widget .datepicker>div{display:none}.bootstrap-datetimepicker-widget .picker-switch{text-align:center}.bootstrap-datetimepicker-widget table{width:100%;margin:0}.bootstrap-datetimepicker-widget td,.bootstrap-datetimepicker-widget th{width:20px;height:20px;text-align:center;border-radius:4px}.bootstrap-datetimepicker-widget td.day:hover,.bootstrap-datetimepicker-widget td.hour:hover,.bootstrap-datetimepicker-widget td.minute:hover,.bootstrap-datetimepicker-widget td.second:hover{cursor:pointer;background:#eee}.bootstrap-datetimepicker-widget td.old,.bootstrap-datetimepicker-widget td.new{color:#999}.bootstrap-datetimepicker-widget td.active,.bootstrap-datetimepicker-widget td.active:hover{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#428bca}.bootstrap-datetimepicker-widget td.disabled,.bootstrap-datetimepicker-widget td.disabled:hover{color:#999;cursor:not-allowed;background:0}.bootstrap-datetimepicker-widget td span{display:block;float:left;width:47px;height:54px;margin:2px;line-height:54px;cursor:pointer;border-radius:4px}.bootstrap-datetimepicker-widget td span:hover{background:#eee}.bootstrap-datetimepicker-widget td span.active{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#428bca}.bootstrap-datetimepicker-widget td span.old{color:#999}.bootstrap-datetimepicker-widget td span.disabled,.bootstrap-datetimepicker-widget td span.disabled:hover{color:#999;cursor:not-allowed;background:0}.bootstrap-datetimepicker-widget th.switch{width:145px}.bootstrap-datetimepicker-widget th.next,.bootstrap-datetimepicker-widget th.prev{font-size:21px}.bootstrap-datetimepicker-widget th.disabled,.bootstrap-datetimepicker-widget th.disabled:hover{color:#999;cursor:not-allowed;background:0}.bootstrap-datetimepicker-widget thead tr:first-child th{cursor:pointer}.bootstrap-datetimepicker-widget thead tr:first-child th:hover{background:#eee}.input-group.date .input-group-addon span{display:block;width:16px;height:16px;cursor:pointer}.bootstrap-datetimepicker-widget.left-oriented:before{right:6px;left:auto}.bootstrap-datetimepicker-widget.left-oriented:after{right:7px;left:auto}.bootstrap-datetimepicker-widget ul.list-unstyled li.in div.timepicker div.timepicker-picker table.table-condensed tbody>tr>td{padding:0!important}table.sortable span.sign{position:absolute;top:50%;right:5px;display:block;margin-top:-10px;font-size:12px;color:#bfbfc1}table.sortable th:after{position:absolute;top:50%;right:5px;display:block;margin-top:-10px;font-size:12px;color:#bfbfc1}table.sortable th.arrow:after{content:''}table.sortable span.arrow,span.reversed,th.arrow.down:after,th.reversedarrow.down:after,th.arrow.up:after,th.reversedarrow.up:after{width:0;height:0;margin-top:-2px;font-size:0;line-height:0;border-color:#ccc transparent transparent transparent;border-style:solid;border-width:5px}table.sortable span.arrow.up,th.arrow.up:after{margin-top:-7px;border-color:transparent transparent #ccc transparent}table.sortable span.reversed,th.reversedarrow.down:after{margin-top:-7px;border-color:transparent transparent #ccc transparent}table.sortable span.reversed.up,th.reversedarrow.up:after{margin-top:-2px;border-color:#ccc transparent transparent transparent}table.sortable span.az:before,th.az.down:after{content:"a .. z"}table.sortable span.az.up:before,th.az.up:after{content:"z .. a"}table.sortable th.az.nosort:after,th.AZ.nosort:after,th._19.nosort:after,th.month.nosort:after{content:".."}table.sortable span.AZ:before,th.AZ.down:after{content:"A .. Z"}table.sortable span.AZ.up:before,th.AZ.up:after{content:"Z .. A"}table.sortable span._19:before,th._19.down:after{content:"1 .. 9"}table.sortable span._19.up:before,th._19.up:after{content:"9 .. 1"}table.sortable span.month:before,th.month.down:after{content:"jan .. dec"}table.sortable span.month.up:before,th.month.up:after{content:"dec .. jan"}table.sortable thead th:not([data-defaultsort=disabled]){position:relative;top:0;left:0;cursor:pointer}table.sortable thead th:hover:not([data-defaultsort=disabled]){background:#efefef}table.sortable thead th div.mozilla{position:relative}/*! angular-xeditable - 0.1.8 Edit-in-place for angular.js Build date: 2014-01-10 diff --git a/maploom/static/maploom/assets/MapLoom-1.0.0.js b/maploom/static/maploom/assets/MapLoom-1.0.0.js index 782d812..9c30eeb 100644 --- a/maploom/static/maploom/assets/MapLoom-1.0.0.js +++ b/maploom/static/maploom/assets/MapLoom-1.0.0.js @@ -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 @@ -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) { @@ -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) { @@ -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 { @@ -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); } }); @@ -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) { @@ -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()); } @@ -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 @@ -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; } }); } @@ -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 () { diff --git a/setup.py b/setup.py index ba9b472..4fa3057 100644 --- a/setup.py +++ b/setup.py @@ -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='rogue@lmnsolutions.com', url='https://github.com/ROGUE-JCTD/django-maploom',