From 8d6d7a1bf573a8c5fceee6a6d9025763c5cfbb9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Thu, 16 Apr 2015 09:19:10 +0200 Subject: [PATCH] Added two missing ; --- src/octoprint/static/js/app/main.js | 132 ++++++++++++++-------------- 1 file changed, 66 insertions(+), 66 deletions(-) diff --git a/src/octoprint/static/js/app/main.js b/src/octoprint/static/js/app/main.js index 63b1779f..73fe2c04 100644 --- a/src/octoprint/static/js/app/main.js +++ b/src/octoprint/static/js/app/main.js @@ -262,18 +262,18 @@ $(function() { } }; - ko.bindingHandlers.contextMenu = { - init: function (element, valueAccessor, allBindingsAccessor, viewModel, bindingContext) { - var val = ko.utils.unwrapObservable(valueAccessor()); - - $(element).contextMenu(val); - }, - update: function (element, valueAccessor, allBindingsAccessor, viewModel, bindingContext) { - var val = ko.utils.unwrapObservable(valueAccessor()); - - $(element).contextMenu(val); - } - } + ko.bindingHandlers.contextMenu = { + init: function (element, valueAccessor, allBindingsAccessor, viewModel, bindingContext) { + var val = ko.utils.unwrapObservable(valueAccessor()); + + $(element).contextMenu(val); + }, + update: function (element, valueAccessor, allBindingsAccessor, viewModel, bindingContext) { + var val = ko.utils.unwrapObservable(valueAccessor()); + + $(element).contextMenu(val); + } + }; //~~ some additional hooks and initializations @@ -303,60 +303,60 @@ $(function() { } }; - $.fn.isChildOf = function (element) { - return $(element).has(this).length > 0; - } - - // from http://jsfiddle.net/KyleMit/X9tgY/ - $.fn.contextMenu = function (settings) { - return this.each(function () { - // Open context menu - $(this).on("contextmenu", function (e) { - // return native menu if pressing control - if (e.ctrlKey) return; - - $(settings.menuSelector) - .data("invokedOn", $(e.target)) - .show() - .css({ - position: "absolute", - left: getMenuPosition(e.clientX, 'width', 'scrollLeft'), - top: getMenuPosition(e.clientY, 'height', 'scrollTop'), - "z-index": 9999 - }).off('click') - .on('click', function (e) { - if (e.target.tagName.toLowerCase() == "input") - return; - - $(this).hide(); - - var $invokedOn = $(this).data("invokedOn"); - var $selectedMenu = $(e.target); - - settings.menuSelected.call(this, $invokedOn, $selectedMenu); - }); - - return false; - }); - - //make sure menu closes on any click - $(document).click(function () { - $(settings.menuSelector).hide(); - }); - }); - - function getMenuPosition(mouse, direction, scrollDir) { - var win = $(window)[direction](), - scroll = $(window)[scrollDir](), - menu = $(settings.menuSelector)[direction](), - position = mouse + scroll; - - // opening menu would pass the side of the page - if (mouse + menu > win && menu < mouse) - position -= menu; - - return position; - } + $.fn.isChildOf = function (element) { + return $(element).has(this).length > 0; + }; + + // from http://jsfiddle.net/KyleMit/X9tgY/ + $.fn.contextMenu = function (settings) { + return this.each(function () { + // Open context menu + $(this).on("contextmenu", function (e) { + // return native menu if pressing control + if (e.ctrlKey) return; + + $(settings.menuSelector) + .data("invokedOn", $(e.target)) + .show() + .css({ + position: "absolute", + left: getMenuPosition(e.clientX, 'width', 'scrollLeft'), + top: getMenuPosition(e.clientY, 'height', 'scrollTop'), + "z-index": 9999 + }).off('click') + .on('click', function (e) { + if (e.target.tagName.toLowerCase() == "input") + return; + + $(this).hide(); + + var $invokedOn = $(this).data("invokedOn"); + var $selectedMenu = $(e.target); + + settings.menuSelected.call(this, $invokedOn, $selectedMenu); + }); + + return false; + }); + + //make sure menu closes on any click + $(document).click(function () { + $(settings.menuSelector).hide(); + }); + }); + + function getMenuPosition(mouse, direction, scrollDir) { + var win = $(window)[direction](), + scroll = $(window)[scrollDir](), + menu = $(settings.menuSelector)[direction](), + position = mouse + scroll; + + // opening menu would pass the side of the page + if (mouse + menu > win && menu < mouse) + position -= menu; + + return position; + } }; // Use bootstrap tabdrop for tabs and pills