Skip to content

Commit 6ff73d5

Browse files
DamianEdwardsDamianEdwards
committed
Minor changes:
- Fixed mismatched quotes - Made PageGenerator depend directly on Razor instead of Mvc, as that's all it needs - Rebased on latest dev changes - #11
1 parent 257b2ab commit 6ff73d5

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,5 @@ nuget.exe
2222
*DS_Store
2323
*.ncrunchsolution
2424
*.*sdf
25-
*.ipch
25+
*.ipch
26+
*.sln.ide

‎src/Microsoft.AspNet.Diagnostics/Views/ErrorPage.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1016,7 +1016,7 @@ public override async Task ExecuteAsync()
10161016
#line default
10171017
#line hidden
10181018

1019-
WriteLiteral(" <script>\r\n //<!--\r\n (function (window, undefined) {\r\n \"use strict\";\r\n\r\n function $(selector, element) {\r\n return new NodeCollection(selector, element);\r\n }\r\n\r\n function NodeCollection(selector, element) {\r\n this.items = [];\r\n element = element || window.document;\r\n\r\n var nodeList;\r\n\r\n if (typeof (selector) === \"string\") {\r\n nodeList = element.querySelectorAll(selector);\r\n for (var i = 0, l = nodeList.length; i < l; i++) {\r\n this.items.push(nodeList.item(i));\r\n }\r\n } else if (selector.tagName) {\r\n this.items.push(selector);\r\n } else if (selector.splice) {\r\n this.items = this.items.concat(selector);\r\n }\r\n }\r\n\r\n NodeCollection.prototype = {\r\n each: function (callback) {\r\n for (var i = 0, l = this.items.length; i < l; i++) {\r\n callback(this.items[i], i);\r\n }\r\n return this;\r\n },\r\n\r\n children: function (selector) {\r\n var children = [];\r\n\r\n this.each(function (el) {\r\n children = children.concat($(selector, el).items);\r\n });\r\n\r\n return $(children);\r\n },\r\n\r\n hide: function () {\r\n this.each(function (el) {\r\n el.style.display = \"none\";\r\n });\r\n\r\n return this;\r\n },\r\n\r\n toggle: function () {\r\n this.each(function (el) {\r\n el.style.display = el.style.display === \"none\" ? \"\" : \"none\";\r\n });\r\n\r\n return this;\r\n },\r\n\r\n show: function () {\r\n this.each(function (el) {\r\n el.style.display = \"\";\r\n });\r\n\r\n return this;\r\n },\r\n\r\n addClass: function (className) {\r\n this.each(function (el) {\r\n var existingClassName = el.className,\r\n classNames;\r\n if (!existingClassName) {\r\n el.className = className;\r\n } else {\r\n classNames = existingClassName.split(\" \");\r\n if (classNames.indexOf(className) < 0) {\r\n el.className = existingClassName + \" \" + className;\r\n }\r\n }\r\n });\r\n\r\n return this;\r\n },\r\n\r\n removeClass: function (className) {\r\n this.each(function (el) {\r\n var existingClassName = el.className,\r\n classNames, index;\r\n if (existingClassName === className) {\r\n el.className = \"\";\r\n } else if (existingClassName) {\r\n classNames = existingClassName.split(\" \");\r\n index = classNames.indexOf(className);\r\n if (index > 0) {\r\n classNames.splice(index, 1);\r\n el.className = classNames.join(\" \");\r\n }\r\n }\r\n });\r\n\r\n return this;\r\n },\r\n\r\n toggleClass: function (className) {\r\n this.each(function (el) {\r\n var classNames = el.className.split(\" \");\r\n if (classNames.indexOf(className) >= 0) {\r\n $(el).removeClass(className);\r\n } else {\r\n $(el).addClass(className);\r\n }\r\n });\r\n\r\n return this;\r\n },\r\n\r\n attr: function (name) {\r\n if (this.items.length === 0) {\r\n return null;\r\n }\r\n\r\n return this.items[0].getAttribute(name);\r\n },\r\n\r\n on: function (eventName, handler) {\r\n this.each(function (el, idx) {\r\n var callback = function (e) {\r\n e = e || window.event;\r\n if (!e.which && e.keyCode) {\r\n e.which = e.keyCode; // Normalize IE8 key events\r\n }\r\n handler.apply(el, [e]);\r\n };\r\n\r\n if (el.addEventListener) { // DOM Events\r\n el.addEventListener(eventName, callback, false);\r\n } else if (el.attachEvent) { // IE8 events\r\n el.attachEvent('on' + eventName, callback)\r\n } else {\r\n el['on' + type] = callback;\r\n }\r\n });\r\n\r\n return this;\r\n },\r\n\r\n click: function (handler) {\r\n return this.on(\"click\", handler);\r\n },\r\n\r\n keypress: function (handler) {\r\n return this.on(\"keypress\", handler);\r\n }\r\n };\r\n\r\n function frame(el) {\r\n $(el).children(\".source .collapsible\").toggle();\r\n }\r\n\r\n function tab(el) {\r\n var unselected = $(\"#header .selected\").removeClass(\"selected\").attr(\"id\");\r\n var selected = $(el).addClass(\"selected\").attr(\"id\");\r\n\r\n $(\"#\" + unselected + \"page\").hide();\r\n $(\"#\" + selected + \"page\").show();\r\n }\r\n\r\n $(\".collapsible\").hide();\r\n $(\".page\").hide();\r\n $(\"#stackpage\").show();\r\n\r\n $(\".frame\")\r\n .click(function () {\r\n frame(this);\r\n })\r\n .keypress(function (e) {\r\n if (e.which === 13) {\r\n frame(this);\r\n }\r\n });\r\n\r\n $(\"#header li\")\r\n .click(function () {\r\n tab(this)\r\n })\r\n .keypress(function (e) {\r\n if (e.which === 13) {\r\n tab(this);\r\n }\r\n });\r\n})(window);\r\n " +
1019+
WriteLiteral(" <script>\r\n //<!--\r\n (function (window, undefined) {\r\n \"use strict\";\r\n\r\n function $(selector, element) {\r\n return new NodeCollection(selector, element);\r\n }\r\n\r\n function NodeCollection(selector, element) {\r\n this.items = [];\r\n element = element || window.document;\r\n\r\n var nodeList;\r\n\r\n if (typeof (selector) === \"string\") {\r\n nodeList = element.querySelectorAll(selector);\r\n for (var i = 0, l = nodeList.length; i < l; i++) {\r\n this.items.push(nodeList.item(i));\r\n }\r\n } else if (selector.tagName) {\r\n this.items.push(selector);\r\n } else if (selector.splice) {\r\n this.items = this.items.concat(selector);\r\n }\r\n }\r\n\r\n NodeCollection.prototype = {\r\n each: function (callback) {\r\n for (var i = 0, l = this.items.length; i < l; i++) {\r\n callback(this.items[i], i);\r\n }\r\n return this;\r\n },\r\n\r\n children: function (selector) {\r\n var children = [];\r\n\r\n this.each(function (el) {\r\n children = children.concat($(selector, el).items);\r\n });\r\n\r\n return $(children);\r\n },\r\n\r\n hide: function () {\r\n this.each(function (el) {\r\n el.style.display = \"none\";\r\n });\r\n\r\n return this;\r\n },\r\n\r\n toggle: function () {\r\n this.each(function (el) {\r\n el.style.display = el.style.display === \"none\" ? \"\" : \"none\";\r\n });\r\n\r\n return this;\r\n },\r\n\r\n show: function () {\r\n this.each(function (el) {\r\n el.style.display = \"\";\r\n });\r\n\r\n return this;\r\n },\r\n\r\n addClass: function (className) {\r\n this.each(function (el) {\r\n var existingClassName = el.className,\r\n classNames;\r\n if (!existingClassName) {\r\n el.className = className;\r\n } else {\r\n classNames = existingClassName.split(\" \");\r\n if (classNames.indexOf(className) < 0) {\r\n el.className = existingClassName + \" \" + className;\r\n }\r\n }\r\n });\r\n\r\n return this;\r\n },\r\n\r\n removeClass: function (className) {\r\n this.each(function (el) {\r\n var existingClassName = el.className,\r\n classNames, index;\r\n if (existingClassName === className) {\r\n el.className = \"\";\r\n } else if (existingClassName) {\r\n classNames = existingClassName.split(\" \");\r\n index = classNames.indexOf(className);\r\n if (index > 0) {\r\n classNames.splice(index, 1);\r\n el.className = classNames.join(\" \");\r\n }\r\n }\r\n });\r\n\r\n return this;\r\n },\r\n\r\n toggleClass: function (className) {\r\n this.each(function (el) {\r\n var classNames = el.className.split(\" \");\r\n if (classNames.indexOf(className) >= 0) {\r\n $(el).removeClass(className);\r\n } else {\r\n $(el).addClass(className);\r\n }\r\n });\r\n\r\n return this;\r\n },\r\n\r\n attr: function (name) {\r\n if (this.items.length === 0) {\r\n return null;\r\n }\r\n\r\n return this.items[0].getAttribute(name);\r\n },\r\n\r\n on: function (eventName, handler) {\r\n this.each(function (el, idx) {\r\n var callback = function (e) {\r\n e = e || window.event;\r\n if (!e.which && e.keyCode) {\r\n e.which = e.keyCode; // Normalize IE8 key events\r\n }\r\n handler.apply(el, [e]);\r\n };\r\n\r\n if (el.addEventListener) { // DOM Events\r\n el.addEventListener(eventName, callback, false);\r\n } else if (el.attachEvent) { // IE8 events\r\n el.attachEvent(\"on\" + eventName, callback)\r\n } else {\r\n el[\"on\" + type] = callback;\r\n }\r\n });\r\n\r\n return this;\r\n },\r\n\r\n click: function (handler) {\r\n return this.on(\"click\", handler);\r\n },\r\n\r\n keypress: function (handler) {\r\n return this.on(\"keypress\", handler);\r\n }\r\n };\r\n\r\n function frame(el) {\r\n $(el).children(\".source .collapsible\").toggle();\r\n }\r\n\r\n function tab(el) {\r\n var unselected = $(\"#header .selected\").removeClass(\"selected\").attr(\"id\");\r\n var selected = $(el).addClass(\"selected\").attr(\"id\");\r\n\r\n $(\"#\" + unselected + \"page\").hide();\r\n $(\"#\" + selected + \"page\").show();\r\n }\r\n\r\n $(\".collapsible\").hide();\r\n $(\".page\").hide();\r\n $(\"#stackpage\").show();\r\n\r\n $(\".frame\")\r\n .click(function () {\r\n frame(this);\r\n })\r\n .keypress(function (e) {\r\n if (e.which === 13) {\r\n frame(this);\r\n }\r\n });\r\n\r\n $(\"#header li\")\r\n .click(function () {\r\n tab(this)\r\n })\r\n .keypress(function (e) {\r\n if (e.which === 13) {\r\n tab(this);\r\n }\r\n });\r\n})(window);\r\n " +
10201020
" //-->\r\n </script>\r\n </body>\r\n</html>\r\n");
10211021
}
10221022
}

‎src/Microsoft.AspNet.Diagnostics/Views/ErrorPage.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,9 +135,9 @@
135135
if (el.addEventListener) { // DOM Events
136136
el.addEventListener(eventName, callback, false);
137137
} else if (el.attachEvent) { // IE8 events
138-
el.attachEvent('on' + eventName, callback)
138+
el.attachEvent("on" + eventName, callback)
139139
} else {
140-
el['on' + type] = callback;
140+
el["on" + type] = callback;
141141
}
142142
});
143143

‎src/PageGenerator/Project.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"dependencies": {
33
"Microsoft.AspNet.Diagnostics": "",
44
"Microsoft.Net.Runtime.Interfaces": "0.1.0-alpha-*",
5-
"Microsoft.AspNet.Mvc": "0.1.0-alpha-*"
5+
"Microsoft.AspNet.Razor": "0.1.0-alpha-*"
66
},
77

88
"configurations" : {

0 commit comments

Comments
 (0)