Bump dependencies to latest possible.

* Node Sass pinned because of issue with importing css or scss * Jasmine pinned because we need to update tests for newer version
rapid7 · Dec 29, 2015 · b0ed620 · b0ed620
1 parent 7eb6945
commit b0ed620
Show file tree

Hide file tree

Showing 7 changed files with 50 additions and 37 deletions.
diff --git a/Gruntfile.coffee b/Gruntfile.coffee
@@ -96,7 +96,6 @@ module.exports = (grunt) ->
     uglify:
       options:
         mangle: true
-        screwIE8: true # always
       dist:
         files:
           "dist/marionette.carpenter.min.js": "dist/marionette.carpenter.js"
@@ -140,6 +139,9 @@ module.exports = (grunt) ->
         ]
         sourceMap: false
         style: 'compact'
+        functions:
+          'image-url($img)': (img) ->
+            new require('node-sass').types.String('url("/' + img.getValue() + '")')
       build:
         expand: true
         flatten: true

diff --git a/assets/images/pagination_new.png b/assets/images/pagination_new.png
diff --git a/assets/images/pagination_new_2x.png b/assets/images/pagination_new_2x.png
diff --git a/dist/marionette.carpenter.css b/dist/marionette.carpenter.css
@@ -82,12 +82,14 @@
 .table-component .buttons-region ul li a.action-button.tag:after {
   background-color: #90da2c;
   content: '+'; }
+
 .table-component .buttons-region ul li a.action-button.tag:hover {
   text-decoration: none;
   background-color: inherit;
   color: #666; }
   .table-component .buttons-region ul li a.action-button.tag:hover:after {
     background-color: #83c923; }
+
 .table-component .buttons-region ul li a.action-button.tag:active {
   background-color: inherit;
   color: #333; }
@@ -151,11 +153,11 @@
       padding-top: 250px;
       width: 100%; }
     .table-component .table-region thead {
-      background-image: -owg(linear-gradient(#fff, #dfdfdf));
-      background-image: -webkit(linear-gradient(#fff, #dfdfdf));
-      background-image: -moz(linear-gradient(#fff, #dfdfdf));
-      background-image: -o(linear-gradient(#fff, #dfdfdf));
-      background-image: linear-gradient(#fff, #dfdfdf); }
+      background-image: -owg(compact(linear-gradient(#fff, #dfdfdf), false, false, false, false, false, false, false, false, false));
+      background-image: -webkit(compact(linear-gradient(#fff, #dfdfdf), false, false, false, false, false, false, false, false, false));
+      background-image: -moz(compact(linear-gradient(#fff, #dfdfdf), false, false, false, false, false, false, false, false, false));
+      background-image: -o(compact(linear-gradient(#fff, #dfdfdf), false, false, false, false, false, false, false, false, false));
+      background-image: compact(linear-gradient(#fff, #dfdfdf), false, false, false, false, false, false, false, false, false); }
       .table-component .table-region thead th {
         cursor: normal;
         -webkit-user-select: none;
@@ -207,11 +209,11 @@
         .table-component .table-region thead th.sortable {
           cursor: pointer; }
           .table-component .table-region thead th.sortable:hover, .table-component .table-region thead th.sortable.sort {
-            background-image: -owg(linear-gradient(#f2f2f2, #d2d2d2));
-            background-image: -webkit(linear-gradient(#f2f2f2, #d2d2d2));
-            background-image: -moz(linear-gradient(#f2f2f2, #d2d2d2));
-            background-image: -o(linear-gradient(#f2f2f2, #d2d2d2));
-            background-image: linear-gradient(#f2f2f2, #d2d2d2); }
+            background-image: -owg(compact(linear-gradient(#f2f2f2, #d2d2d2), false, false, false, false, false, false, false, false, false));
+            background-image: -webkit(compact(linear-gradient(#f2f2f2, #d2d2d2), false, false, false, false, false, false, false, false, false));
+            background-image: -moz(compact(linear-gradient(#f2f2f2, #d2d2d2), false, false, false, false, false, false, false, false, false));
+            background-image: -o(compact(linear-gradient(#f2f2f2, #d2d2d2), false, false, false, false, false, false, false, false, false));
+            background-image: compact(linear-gradient(#f2f2f2, #d2d2d2), false, false, false, false, false, false, false, false, false); }
         .table-component .table-region thead th.disabled {
           pointer-events: none;
           background-image: none;
@@ -237,9 +239,9 @@
       line-height: 23px;
       vertical-align: baseline; }
     .table-component .pagination-region .paginator label.row_select select {
-      -webkit-box-shadow: inset 0, 0, 2px, rgba(0, 0, 0, 0.2);
-      -moz-box-shadow: inset 0, 0, 2px, rgba(0, 0, 0, 0.2);
-      box-shadow: inset 0, 0, 2px, rgba(0, 0, 0, 0.2);
+      -webkit-box-shadow: compact(inset 0, 0, 2px, rgba(0, 0, 0, 0.2), false, false, false, false, false, false);
+      -moz-box-shadow: compact(inset 0, 0, 2px, rgba(0, 0, 0, 0.2), false, false, false, false, false, false);
+      box-shadow: compact(inset 0, 0, 2px, rgba(0, 0, 0, 0.2), false, false, false, false, false, false);
       -webkit-border-radius: 2px;
       -moz-border-radius: 2px;
       -ms-border-radius: 2px;
@@ -288,7 +290,7 @@
         cursor: pointer; }
         .table-component .pagination-region .paginator .page_navigation a, .table-component .pagination-region .paginator .page_navigation a:hover {
           background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAAAKCAYAAAAjBNk8AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyRpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoTWFjaW50b3NoKSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDo5OEQ2RDdCMjE5ODMxMUUzODMwMkVBOTQ1MURCQkI3NiIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDo5OEQ2RDdCMzE5ODMxMUUzODMwMkVBOTQ1MURCQkI3NiI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOjk4RDZEN0IwMTk4MzExRTM4MzAyRUE5NDUxREJCQjc2IiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOjk4RDZEN0IxMTk4MzExRTM4MzAyRUE5NDUxREJCQjc2Ii8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+Hz0KXgAAAaxJREFUeNq0lTGugkAURR8uhgW4BEtCY6XGgkIbGxIbExsTbaxcgb3roKIjNNhYsQB6QI3z/zWZyWgQZoC5yYuBCec8J8ODGGP0XZfLhQ2HQ1HT6ZRlWUZFUYiqeq4N53w+v9fwq8LkJT8n88CHR/aiDxVmG86AKjIej63VaiWub7cbrddrlue5eFAlfXGawlnggg8PD/zowxRn8As0n88tz/PEvev1SpvNRvx51Yb64Kh4wAMXfB544dfpV5dTuYGv1+tdi8XCmkwm4n4URbTb7VhZlkoN9cVpCjjggcsDH7y8B1OcQd1RRv0fXct1XbEWhiEdDgem80p05TQFHPB44IFP9pvi1J5AFAZqmqYf67Zta53ArpymfHPggU/2m+LUnsD7/U7b7ZYlSSLWZrMZSmsod+U0BRzweOCBD16dE9iG83MDH48H7fd7Fsex/FWl5XKpNZT74Kh4wAOXBz544dfpV5dTuYHP55OOx+PHPHAc5z0PdF6JvjiqowJc8OU5Cz/6MMWp3MDT6cSCIBDXo9GIfN+35NdSJX1xVEcFAj48PPCjD1OcPwEGADyKAmTPW4BiAAAAAElFTkSuQmCC); }
-          @media (min--moz-device-pixel-ratio: 1.3), (-o-min-device-pixel-ratio: 2.6/2), (-webkit-min-device-pixel-ratio: 1.3), (min-device-pixel-ratio: 1.3), (min-resolution: 1.3dppx) {
+          @media (min--moz-device-pixel-ratio: 1.3), (-o-min-device-pixel-ratio: 2.6 / 2), (-webkit-min-device-pixel-ratio: 1.3), (min-device-pixel-ratio: 1.3), (min-resolution: 1.3dppx) {
             .table-component .pagination-region .paginator .page_navigation a, .table-component .pagination-region .paginator .page_navigation a:hover {
               /* on retina, use image that's scaled by 2 */
               background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAI4AAAAUCAYAAABbAAUtAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyNpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNS1jMDE0IDc5LjE1MTQ4MSwgMjAxMy8wMy8xMy0xMjowOToxNSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIChNYWNpbnRvc2gpIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjY2MDc4MEFBREVCRjExRTM4MTY1OEE1NDQ5QzYxRjE1IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjY2MDc4MEFCREVCRjExRTM4MTY1OEE1NDQ5QzYxRjE1Ij4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjYwNzgwQThERUJGMTFFMzgxNjU4QTU0NDlDNjFGMTUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjYwNzgwQTlERUJGMTFFMzgxNjU4QTU0NDlDNjFGMTUiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz52TA0sAAABVUlEQVR42uya4Q2DIBCFSTfoCqzgLK7QFVzBWVyhK7iCK3QFShObGMPRA7kDmnfJ/SzvYT8FjjPOOcNJHw+f7pQvn5Y7Rm7GtA0j9jGOv7UCHu1JgxsjMbdB+rkG5sD2kjrwHBh49XkXnMw3SO2OwRn2P+Y8r7ECNElecgTWwOCLAjikdqfgfIDfAvOZK0CT7KWkyKQADqndITiL5gv4w3uylyufNRfIQRicqHZH4EwB/5vkkh/xneVFXbAAOFHtDsBRe+kkPwASn7inAjikduPgWM1lnuE324v6pqogOKR2w+CQm/sK4Fw65Kgf4wqCE9VuEJxoOUEZmstlFenCkRUGJ6rdEDgsj5WLfEnP5GZk427qRU3t//eCpQpLlfpShc0xNsc4juM4rnMcRwEQBUBcOeDKQf7KAZecuOREWwXaKnTaKtDIhUauZHDQOorW0WO+BRgAtVH6DdOkhwgAAAAASUVORK5CYII=);
@@ -424,5 +426,7 @@
     z-index: 2; }
   .table-component table.rc-table-resizing {
     cursor: ew-resize; }
-  .table-component table.rc-table-resizing thead, .table-component table.rc-table-resizing thead > th, .table-component table.rc-table-resizing thead > th > a {
+  .table-component table.rc-table-resizing thead,
+  .table-component table.rc-table-resizing thead > th,
+  .table-component table.rc-table-resizing thead > th > a {
     cursor: ew-resize; }
diff --git a/dist/marionette.carpenter.js b/dist/marionette.carpenter.js
@@ -741,6 +741,7 @@ define('templates/action_button',[],function(){
       return _safe(result);
     };
     (function() {
+
       _print(_safe('<a href=\'javascript:void(0)\' '));
 
       if (this.id) {
@@ -964,6 +965,7 @@ define('templates/empty',[],function(){
       return _safe(result);
     };
     (function() {
+
       _print(_safe('<td colspan=\'100%\'>No items were found.</td>'));
 
     }).call(this);
@@ -1034,6 +1036,7 @@ define('templates/header',[],function(){
       return _safe(result);
     };
     (function() {
+
       if (this.title && this.title.length) {
         _print(_safe('\n  <h3\n    '));
         if (this.htmlID != null) {
@@ -1133,6 +1136,7 @@ define('templates/layout',[],function(){
       return _safe(result);
     };
     (function() {
+
       _print(_safe('\n<div class=\'header-region\'>\n</div>\n\n'));
 
       _print(_safe('\n<div class=\'selection-indicator-region\'>\n</div>\n\n'));
@@ -1292,6 +1296,7 @@ define('templates/loading',[],function(){
       return _safe(result);
     };
     (function() {
+
       _print(_safe('<td colspan="100%" class=\'tab-loading\'>\n</td>'));
 
     }).call(this);
@@ -1358,13 +1363,13 @@ define('templates/paginator',[],function(){
       return _safe(result);
     };
     (function() {
-      var i, j, len, ref, val;
+      var i, val, _i, _len, _ref;
 
       if (this.collection.length > 0) {
         _print(_safe('\n  <div class=\'left\'>\n    <label class=\'row_select\'>\n      <span class=\'line\'>Show</span>\n      <select class=\'rows\'>\n        '));
-        ref = this.perPageOptions;
-        for (j = 0, len = ref.length; j < len; j++) {
-          i = ref[j];
+        _ref = this.perPageOptions;
+        for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+          i = _ref[_i];
           _print(_safe('\n          '));
           val = i === 'All' ? this.ALL_MAGIC : i;
           _print(_safe('\n          <option value=\''));
@@ -2605,7 +2610,7 @@ define('templates/row',[],function(){
       return _safe(result);
     };
     (function() {
-      var column, i, idx, len, ref;
+      var column, idx, _i, _len, _ref;
 
       if (this.selectable) {
         _print(_safe('\n  <td class="checkbox">\n    <input type="checkbox" data-id="'));
@@ -2623,9 +2628,9 @@ define('templates/row',[],function(){
 
       _print(_safe('\n'));
 
-      ref = this.columns;
-      for (i = 0, len = ref.length; i < len; i++) {
-        column = ref[i];
+      _ref = this.columns;
+      for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+        column = _ref[_i];
         _print(_safe('\n  <td class=\''));
         _print(column["class"]);
         _print(_safe(' '));
@@ -2875,7 +2880,7 @@ define('templates/table',[],function(){
       return _safe(result);
     };
     (function() {
-      var column, i, len, ref, sorted;
+      var column, sorted, _i, _len, _ref;
 
       _print(_safe('<table '));
 
@@ -2893,9 +2898,9 @@ define('templates/table',[],function(){
 
       _print(_safe('\n\n      '));
 
-      ref = this.columns;
-      for (i = 0, len = ref.length; i < len; i++) {
-        column = ref[i];
+      _ref = this.columns;
+      for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+        column = _ref[_i];
         _print(_safe('\n        '));
         sorted = column.attribute === this.sortColumn;
         _print(_safe('\n        <th unselectable="on" class="unselectable '));
@@ -3405,6 +3410,7 @@ define('templates/selection_indicator',[],function(){
       return _safe(result);
     };
     (function() {
+
       _print(_safe('<div class="selection-indicator"><span class="num-selected">'));
 
       _print(this.numSelected);

diff --git a/dist/marionette.carpenter.min.js b/dist/marionette.carpenter.min.js
diff --git a/package.json b/package.json
@@ -15,20 +15,21 @@
     "url": "git://github.com/rapid7/marionette.carpenter.git"
   },
   "devDependencies": {
-    "bower": "1.3.8",
+    "bower": "1.7.1",
     "grunt": "~0.4.5",
     "grunt-cli": "0.1.13",
-    "grunt-contrib-clean": "^0.6.0",
-    "grunt-contrib-coffee": "~0.11.0",
-    "grunt-sass": "^0.17.0",
+    "grunt-contrib-clean": "^0.7.0",
+    "grunt-contrib-coffee": "~0.13.0",
     "grunt-contrib-concat": "^0.5.0",
-    "grunt-contrib-copy": "^0.5.0",
+    "grunt-contrib-copy": "^0.8.0",
     "grunt-contrib-jasmine": "~0.5.0",
+    "grunt-contrib-uglify": "~0.11.0",
     "grunt-contrib-watch": "~0.6.1",
     "grunt-eco": "~0.1.2",
-    "grunt-requirejs": "~0.4.0",
     "grunt-image-embed": "~0.3.3",
-    "grunt-contrib-uglify": "~0.7.0"
+    "grunt-requirejs": "~0.4.0",
+    "grunt-sass": "^1.1.0",
+    "node-sass": "3.4.1"
   },
   "license": "BSD-3-Clause"
 }