* specific path to parent master page (non-specific doesn't work in mono)
* remove functionality to submit category on [ENTER], since preventing the parent form from submitting is way too annoying
This commit is contained in:
parent
0b583efcee
commit
7764fe07d7
@ -1,4 +1,4 @@
|
|||||||
<%@ Master Language="C#" MasterPageFile="PageWithoutAnalytics.Master" %>
|
<%@ Master Language="C#" MasterPageFile="~/Views/Shared/PageWithoutAnalytics.Master" %>
|
||||||
<asp:Content runat="server" ID="Title" ContentPlaceHolderID="TitleContent"><asp:ContentPlaceHolder runat="server" ID="TitleContent" /></asp:Content>
|
<asp:Content runat="server" ID="Title" ContentPlaceHolderID="TitleContent"><asp:ContentPlaceHolder runat="server" ID="TitleContent" /></asp:Content>
|
||||||
<asp:Content runat="server" ID="Main" ContentPlaceHolderID="MainContent"><asp:ContentPlaceHolder runat="server" ID="MainContent" /></asp:Content>
|
<asp:Content runat="server" ID="Main" ContentPlaceHolderID="MainContent"><asp:ContentPlaceHolder runat="server" ID="MainContent" /></asp:Content>
|
||||||
<asp:Content runat="server" ID="Head" ContentPlaceHolderID="HeadContent"><asp:ContentPlaceHolder runat="server" ID="HeadContent" /></asp:Content>
|
<asp:Content runat="server" ID="Head" ContentPlaceHolderID="HeadContent"><asp:ContentPlaceHolder runat="server" ID="HeadContent" /></asp:Content>
|
||||||
|
File diff suppressed because one or more lines are too long
@ -427,16 +427,7 @@
|
|||||||
var $table = $("#category-checkbox-table"), $cell;
|
var $table = $("#category-checkbox-table"), $cell;
|
||||||
var $submit = $("<a/>").attr({ href: "#", title: "submit" }).addClass("submit-icon").click(submitCategory);
|
var $submit = $("<a/>").attr({ href: "#", title: "submit" }).addClass("submit-icon").click(submitCategory);
|
||||||
var $cancel = $("<a/>").attr({ href: "#", title: "cancel" }).addClass("cancel-icon");
|
var $cancel = $("<a/>").attr({ href: "#", title: "cancel" }).addClass("cancel-icon");
|
||||||
var $input = $("<input/>").attr({ id: "new-category-name", type: "text" }).bind("keyup", function(e) {
|
var $input = $("<input/>").attr({ id: "new-category-name", type: "text" });
|
||||||
if (e.which === 13) {
|
|
||||||
e.preventDefault(); //make sure the parent form doesn't get submitted
|
|
||||||
submitCategory.call($(this).siblings(".submit-icon").get(0)); //make sure to invoke it with the correct context
|
|
||||||
} else if (e.which === 27) {
|
|
||||||
e.preventDefault();
|
|
||||||
$cancel.click();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
if (categoryId !== undefined) {
|
if (categoryId !== undefined) {
|
||||||
$cell = $table.find("input[value='" + categoryId + "']").parent();
|
$cell = $table.find("input[value='" + categoryId + "']").parent();
|
||||||
$cell.children().hide();
|
$cell.children().hide();
|
||||||
|
Loading…
Reference in New Issue
Block a user