Pull in current ng-grid master and fix #645

hawtio · Nov 19, 2013 · dc6bb18 · dc6bb18
1 parent 3ab5ac3
commit dc6bb18
Show file tree

Hide file tree

Showing 3 changed files with 284 additions and 607 deletions.
diff --git a/hawtio-web/src/main/webapp/css/ng-grid.css b/hawtio-web/src/main/webapp/css/ng-grid.css
@@ -215,8 +215,7 @@
   width: 100%;
 }
 .ngGroupIcon {
-  background-image: url(data:image/png;
-    base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAANCAYAAACZ3F9/AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAadEVYdFNvZnR3YXJlAFBhaW50Lk5FVCB2My41LjEwMPRyoQAAAEFJREFUKFNjoAhISkr+h2J5JDZODNXGwGBsbPwfhIGAA8bGh6HaGBiAGhxAGJmND4M1gQCSM0adCsVQbcPcqQwMALWDGyDvWPefAAAAAElFTkSuQmCC);
+  background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAANCAYAAACZ3F9/AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAadEVYdFNvZnR3YXJlAFBhaW50Lk5FVCB2My41LjEwMPRyoQAAAEFJREFUKFNjoAhISkr+h2J5JDZODNXGwGBsbPwfhIGAA8bGh6HaGBiAGhxAGJmND4M1gQCSM0adCsVQbcPcqQwMALWDGyDvWPefAAAAAElFTkSuQmCC);
   background-repeat: no-repeat;
   height: 15px;
   width: 15px;
@@ -225,8 +224,7 @@
   top: 2px;
 }
 .ngGroupedByIcon {
-  background-image: url(data:image/png;
-    base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAANCAYAAACZ3F9/AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAadEVYdFNvZnR3YXJlAFBhaW50Lk5FVCB2My41LjEwMPRyoQAAAElJREFUKFNjoAhISkr+R8LyaHwMDNXGwGBsbPwfhoGAA5mPDUO1oWpE52PDYE0gALTFAYbR+dgwWBMIoPlh1I9ADNU2NPzIwAAAFQYI9E4OLvEAAAAASUVORK5CYII=);
+  background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAANCAYAAACZ3F9/AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAadEVYdFNvZnR3YXJlAFBhaW50Lk5FVCB2My41LjEwMPRyoQAAAElJREFUKFNjoAhISkr+R8LyaHwMDNXGwGBsbPwfhoGAA5mPDUO1oWpE52PDYE0gALTFAYbR+dgwWBMIoPlh1I9ADNU2NPzIwAAAFQYI9E4OLvEAAAAASUVORK5CYII=);
   background-repeat: no-repeat;
   height: 15px;
   width: 15px;

diff --git a/hawtio-web/src/main/webapp/index.html b/hawtio-web/src/main/webapp/index.html
@@ -313,7 +313,7 @@ <h2 title="Status Code: {{connectFailure.status}}">Cannot Connect: {{connectFail
     <script type="text/javascript" src="lib/angular-resource.min.js"></script>
 
     <!-- ng-grid -->
-    <script type="text/javascript" src="lib/ng-grid-2.0.7.min.js"></script>
+    <script type="text/javascript" src="lib/ng-grid.min.js"></script>
 
     <!-- dyna tree -->
     <script type="text/javascript" src="lib/jquery-ui.custom.min.js"></script>