forked from Juniper/contrail-webui-third-party
-
Notifications
You must be signed in to change notification settings - Fork 0
/
jnpr_slickgrid.patch
51 lines (45 loc) · 2.42 KB
/
jnpr_slickgrid.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
diff -Naur old/contrail-webui-third-party/jnpr_slickgrid/slick.grid.css new/contrail-webui-third-party/jnpr_slickgrid/slick.grid.css
--- old/contrail-webui-third-party/jnpr_slickgrid/slick.grid.css 2014-05-06 15:46:55.000000000 -0700
+++ new/contrail-webui-third-party/jnpr_slickgrid/slick.grid.css 2014-05-06 14:47:22.000000000 -0700
@@ -81,7 +81,7 @@
}
.slick-row.ui-widget-content, .slick-row.ui-state-active {
- position: absolute;
+/* position: absolute; */
border: 0px;
width: 100%;
}
diff -Naur old/contrail-webui-third-party/jnpr_slickgrid/slick.grid.js new/contrail-webui-third-party/jnpr_slickgrid/slick.grid.js
--- old/contrail-webui-third-party/jnpr_slickgrid/slick.grid.js 2014-05-06 15:46:55.000000000 -0700
+++ new/contrail-webui-third-party/jnpr_slickgrid/slick.grid.js 2014-05-06 14:58:37.000000000 -0700
@@ -924,7 +924,7 @@
"." + uid + " .slick-header-column { left: 1000px; }",
"." + uid + " .slick-top-panel { height:" + options.topPanelHeight + "px; }",
"." + uid + " .slick-headerrow-columns { height:" + options.headerRowHeight + "px; }",
- "." + uid + " .slick-cell { height:" + rowHeight + "px; }",
+// "." + uid + " .slick-cell { height:" + rowHeight + "px; }",
"." + uid + " .slick-row { height:" + options.rowHeight + "px; }"
];
@@ -1418,7 +1418,7 @@
rowCss += " " + metadata.cssClasses;
}
- stringArray.push("<div class='ui-widget-content " + rowCss + "' style='top:" + getRowTop(row) + "px'>");
+ stringArray.push("<div class='ui-widget-content " + rowCss + " slick-row-master slick_row_" + d.id + "' data-id='" + d.id + "'>");
var colspan, m;
for (var i = 0, ii = columns.length; i < ii; i++) {
@@ -1664,7 +1664,7 @@
}
if (h !== oldH) {
- $canvas.css("height", h);
+// $canvas.css("height", h);
scrollTop = $viewport[0].scrollTop;
}
@@ -2272,7 +2272,7 @@
// if this click resulted in some cell child node getting focus,
// don't steal it back - keyboard events will still bubble up
// IE9+ seems to default DIVs to tabIndex=0 instead of -1, so check for cell clicks directly.
- if (e.target != document.activeElement || $(e.target).hasClass("slick-cell")) {
+ if (options.editable && (e.target != document.activeElement || $(e.target).hasClass("slick-cell"))) {
setFocus();
}
}