From 59d67aa0361456cb4f418b226d984433aed82669 Mon Sep 17 00:00:00 2001 From: kelson42 Date: Tue, 14 Aug 2012 16:36:18 +0000 Subject: [PATCH] + remove js warning in kiwix-serve autosuggest --- src/common/resourceTools.h | 82 ++++++++++++++++++--------------- static/server/taskbar.html.part | 2 + 2 files changed, 47 insertions(+), 37 deletions(-) diff --git a/src/common/resourceTools.h b/src/common/resourceTools.h index 855a5a20a..948c796ba 100644 --- a/src/common/resourceTools.h +++ b/src/common/resourceTools.h @@ -21175,43 +21175,51 @@ const unsigned char server_taskbar_html_part[]={ 0x63,0x74,0x69,0x6f,0x6e,0x28,0x29,0x20,0x7b,0x0a,0x20,0x20,0x24,0x28,0x20,0x22, 0x23,0x6b,0x69,0x77,0x69,0x78,0x73,0x65,0x61,0x72,0x63,0x68,0x62,0x6f,0x78,0x22, 0x20,0x29,0x2e,0x61,0x75,0x74,0x6f,0x63,0x6f,0x6d,0x70,0x6c,0x65,0x74,0x65,0x28, - 0x7b,0x0a,0x20,0x20,0x73,0x6f,0x75,0x72,0x63,0x65,0x3a,0x20,0x22,0x2f,0x73,0x75, - 0x67,0x67,0x65,0x73,0x74,0x3f,0x63,0x6f,0x6e,0x74,0x65,0x6e,0x74,0x3d,0x5f,0x5f, - 0x43,0x4f,0x4e,0x54,0x45,0x4e,0x54,0x5f,0x5f,0x22,0x0a,0x20,0x20,0x7d,0x29,0x3b, - 0x0a,0x20,0x20,0x7d,0x29,0x3b,0x0a,0x3c,0x2f,0x73,0x63,0x72,0x69,0x70,0x74,0x3e, - 0x0a,0x0a,0x3c,0x73,0x70,0x61,0x6e,0x20,0x69,0x64,0x3d,0x22,0x6b,0x69,0x77,0x69, - 0x78,0x74,0x6f,0x6f,0x6c,0x62,0x61,0x72,0x22,0x20,0x63,0x6c,0x61,0x73,0x73,0x3d, - 0x22,0x75,0x69,0x2d,0x77,0x69,0x64,0x67,0x65,0x74,0x2d,0x68,0x65,0x61,0x64,0x65, - 0x72,0x20,0x75,0x69,0x2d,0x63,0x6f,0x72,0x6e,0x65,0x72,0x2d,0x61,0x6c,0x6c,0x22, - 0x3e,0x0a,0x20,0x20,0x3c,0x62,0x75,0x74,0x74,0x6f,0x6e,0x20,0x69,0x64,0x3d,0x22, - 0x6b,0x69,0x77,0x69,0x78,0x6c,0x69,0x62,0x72,0x61,0x72,0x79,0x22,0x20,0x6f,0x6e, - 0x63,0x6c,0x69,0x63,0x6b,0x3d,0x22,0x77,0x69,0x6e,0x64,0x6f,0x77,0x2e,0x6c,0x6f, - 0x63,0x61,0x74,0x69,0x6f,0x6e,0x2e,0x68,0x72,0x65,0x66,0x3d,0x27,0x2f,0x27,0x3b, - 0x22,0x3e,0x4c,0x69,0x62,0x72,0x61,0x72,0x79,0x3c,0x2f,0x62,0x75,0x74,0x74,0x6f, - 0x6e,0x3e,0x0a,0x20,0x20,0x3c,0x62,0x75,0x74,0x74,0x6f,0x6e,0x20,0x69,0x64,0x3d, - 0x22,0x6b,0x69,0x77,0x69,0x78,0x68,0x6f,0x6d,0x65,0x22,0x20,0x6f,0x6e,0x63,0x6c, - 0x69,0x63,0x6b,0x3d,0x22,0x77,0x69,0x6e,0x64,0x6f,0x77,0x2e,0x6c,0x6f,0x63,0x61, - 0x74,0x69,0x6f,0x6e,0x2e,0x68,0x72,0x65,0x66,0x3d,0x27,0x2f,0x5f,0x5f,0x43,0x4f, - 0x4e,0x54,0x45,0x4e,0x54,0x5f,0x5f,0x2f,0x27,0x3b,0x22,0x3e,0x48,0x6f,0x6d,0x65, - 0x3c,0x2f,0x62,0x75,0x74,0x74,0x6f,0x6e,0x3e,0x0a,0x20,0x20,0x3c,0x66,0x6f,0x72, - 0x6d,0x20,0x6d,0x65,0x74,0x68,0x6f,0x64,0x3d,0x22,0x47,0x45,0x54,0x22,0x20,0x61, - 0x63,0x74,0x69,0x6f,0x6e,0x3d,0x22,0x2f,0x73,0x65,0x61,0x72,0x63,0x68,0x22,0x20, - 0x2f,0x3e,0x0a,0x20,0x20,0x20,0x20,0x3c,0x69,0x6e,0x70,0x75,0x74,0x20,0x74,0x79, - 0x70,0x65,0x3d,0x22,0x68,0x69,0x64,0x64,0x65,0x6e,0x22,0x20,0x6e,0x61,0x6d,0x65, - 0x3d,0x22,0x63,0x6f,0x6e,0x74,0x65,0x6e,0x74,0x22,0x20,0x76,0x61,0x6c,0x75,0x65, - 0x3d,0x22,0x5f,0x5f,0x43,0x4f,0x4e,0x54,0x45,0x4e,0x54,0x5f,0x5f,0x22,0x20,0x2f, - 0x3e,0x0a,0x20,0x20,0x20,0x20,0x3c,0x69,0x6e,0x70,0x75,0x74,0x20,0x74,0x79,0x70, - 0x65,0x3d,0x22,0x73,0x75,0x62,0x6d,0x69,0x74,0x22,0x20,0x69,0x64,0x3d,0x22,0x6b, - 0x69,0x77,0x69,0x78,0x73,0x65,0x61,0x72,0x63,0x68,0x22,0x20,0x76,0x61,0x6c,0x75, - 0x65,0x3d,0x22,0x53,0x65,0x61,0x72,0x63,0x68,0x22,0x20,0x2f,0x3e,0x0a,0x20,0x20, - 0x20,0x20,0x3c,0x69,0x6e,0x70,0x75,0x74,0x20,0x69,0x64,0x3d,0x22,0x6b,0x69,0x77, - 0x69,0x78,0x73,0x65,0x61,0x72,0x63,0x68,0x62,0x6f,0x78,0x22,0x20,0x6e,0x61,0x6d, - 0x65,0x3d,0x22,0x70,0x61,0x74,0x74,0x65,0x72,0x6e,0x22,0x2f,0x3e,0x0a,0x20,0x20, - 0x3c,0x2f,0x66,0x6f,0x72,0x6d,0x3e,0x0a,0x3c,0x2f,0x73,0x70,0x61,0x6e,0x3e,0x0a, - 0x3c,0x64,0x69,0x76,0x20,0x73,0x74,0x79,0x6c,0x65,0x3d,0x22,0x64,0x69,0x73,0x70, - 0x6c,0x61,0x79,0x3a,0x20,0x62,0x6c,0x6f,0x63,0x6b,0x3b,0x20,0x68,0x65,0x69,0x67, - 0x68,0x74,0x3a,0x20,0x34,0x30,0x70,0x78,0x3b,0x22,0x3e,0x3c,0x2f,0x64,0x69,0x76, - 0x3e,0x0a + 0x7b,0x0a,0x0a,0x20,0x20,0x73,0x6f,0x75,0x72,0x63,0x65,0x3a,0x20,0x22,0x2f,0x73, + 0x75,0x67,0x67,0x65,0x73,0x74,0x3f,0x63,0x6f,0x6e,0x74,0x65,0x6e,0x74,0x3d,0x5f, + 0x5f,0x43,0x4f,0x4e,0x54,0x45,0x4e,0x54,0x5f,0x5f,0x22,0x2c,0x0a,0x20,0x20,0x64, + 0x61,0x74,0x61,0x54,0x79,0x70,0x65,0x3a,0x20,0x22,0x6a,0x73,0x6f,0x6e,0x22,0x2c, + 0x0a,0x20,0x20,0x63,0x61,0x63,0x68,0x65,0x3a,0x20,0x66,0x61,0x6c,0x73,0x65,0x2c, + 0x0a,0x0a,0x20,0x20,0x73,0x65,0x6c,0x65,0x63,0x74,0x3a,0x20,0x66,0x75,0x6e,0x63, + 0x74,0x69,0x6f,0x6e,0x28,0x65,0x76,0x65,0x6e,0x74,0x2c,0x20,0x75,0x69,0x29,0x20, + 0x7b,0x0a,0x20,0x20,0x24,0x28,0x20,0x22,0x23,0x6b,0x69,0x77,0x69,0x78,0x73,0x65, + 0x61,0x72,0x63,0x68,0x66,0x6f,0x72,0x6d,0x22,0x20,0x29,0x2e,0x73,0x75,0x62,0x6d, + 0x69,0x74,0x28,0x29,0x3b,0x0a,0x20,0x20,0x7d,0x2c,0x0a,0x0a,0x20,0x20,0x7d,0x29, + 0x3b,0x0a,0x20,0x20,0x7d,0x29,0x3b,0x0a,0x3c,0x2f,0x73,0x63,0x72,0x69,0x70,0x74, + 0x3e,0x0a,0x0a,0x3c,0x73,0x70,0x61,0x6e,0x20,0x69,0x64,0x3d,0x22,0x6b,0x69,0x77, + 0x69,0x78,0x74,0x6f,0x6f,0x6c,0x62,0x61,0x72,0x22,0x20,0x63,0x6c,0x61,0x73,0x73, + 0x3d,0x22,0x75,0x69,0x2d,0x77,0x69,0x64,0x67,0x65,0x74,0x2d,0x68,0x65,0x61,0x64, + 0x65,0x72,0x20,0x75,0x69,0x2d,0x63,0x6f,0x72,0x6e,0x65,0x72,0x2d,0x61,0x6c,0x6c, + 0x22,0x3e,0x0a,0x20,0x20,0x3c,0x62,0x75,0x74,0x74,0x6f,0x6e,0x20,0x69,0x64,0x3d, + 0x22,0x6b,0x69,0x77,0x69,0x78,0x6c,0x69,0x62,0x72,0x61,0x72,0x79,0x22,0x20,0x6f, + 0x6e,0x63,0x6c,0x69,0x63,0x6b,0x3d,0x22,0x77,0x69,0x6e,0x64,0x6f,0x77,0x2e,0x6c, + 0x6f,0x63,0x61,0x74,0x69,0x6f,0x6e,0x2e,0x68,0x72,0x65,0x66,0x3d,0x27,0x2f,0x27, + 0x3b,0x22,0x3e,0x4c,0x69,0x62,0x72,0x61,0x72,0x79,0x3c,0x2f,0x62,0x75,0x74,0x74, + 0x6f,0x6e,0x3e,0x0a,0x20,0x20,0x3c,0x62,0x75,0x74,0x74,0x6f,0x6e,0x20,0x69,0x64, + 0x3d,0x22,0x6b,0x69,0x77,0x69,0x78,0x68,0x6f,0x6d,0x65,0x22,0x20,0x6f,0x6e,0x63, + 0x6c,0x69,0x63,0x6b,0x3d,0x22,0x77,0x69,0x6e,0x64,0x6f,0x77,0x2e,0x6c,0x6f,0x63, + 0x61,0x74,0x69,0x6f,0x6e,0x2e,0x68,0x72,0x65,0x66,0x3d,0x27,0x2f,0x5f,0x5f,0x43, + 0x4f,0x4e,0x54,0x45,0x4e,0x54,0x5f,0x5f,0x2f,0x27,0x3b,0x22,0x3e,0x48,0x6f,0x6d, + 0x65,0x3c,0x2f,0x62,0x75,0x74,0x74,0x6f,0x6e,0x3e,0x0a,0x20,0x20,0x3c,0x66,0x6f, + 0x72,0x6d,0x20,0x6d,0x65,0x74,0x68,0x6f,0x64,0x3d,0x22,0x47,0x45,0x54,0x22,0x20, + 0x61,0x63,0x74,0x69,0x6f,0x6e,0x3d,0x22,0x2f,0x73,0x65,0x61,0x72,0x63,0x68,0x22, + 0x20,0x69,0x64,0x3d,0x22,0x6b,0x69,0x77,0x69,0x78,0x73,0x65,0x61,0x72,0x63,0x68, + 0x66,0x6f,0x72,0x6d,0x22,0x2f,0x3e,0x0a,0x20,0x20,0x20,0x20,0x3c,0x69,0x6e,0x70, + 0x75,0x74,0x20,0x74,0x79,0x70,0x65,0x3d,0x22,0x68,0x69,0x64,0x64,0x65,0x6e,0x22, + 0x20,0x6e,0x61,0x6d,0x65,0x3d,0x22,0x63,0x6f,0x6e,0x74,0x65,0x6e,0x74,0x22,0x20, + 0x76,0x61,0x6c,0x75,0x65,0x3d,0x22,0x5f,0x5f,0x43,0x4f,0x4e,0x54,0x45,0x4e,0x54, + 0x5f,0x5f,0x22,0x20,0x2f,0x3e,0x0a,0x20,0x20,0x20,0x20,0x3c,0x69,0x6e,0x70,0x75, + 0x74,0x20,0x74,0x79,0x70,0x65,0x3d,0x22,0x73,0x75,0x62,0x6d,0x69,0x74,0x22,0x20, + 0x69,0x64,0x3d,0x22,0x6b,0x69,0x77,0x69,0x78,0x73,0x65,0x61,0x72,0x63,0x68,0x22, + 0x20,0x76,0x61,0x6c,0x75,0x65,0x3d,0x22,0x53,0x65,0x61,0x72,0x63,0x68,0x22,0x20, + 0x2f,0x3e,0x0a,0x20,0x20,0x20,0x20,0x3c,0x69,0x6e,0x70,0x75,0x74,0x20,0x69,0x64, + 0x3d,0x22,0x6b,0x69,0x77,0x69,0x78,0x73,0x65,0x61,0x72,0x63,0x68,0x62,0x6f,0x78, + 0x22,0x20,0x6e,0x61,0x6d,0x65,0x3d,0x22,0x70,0x61,0x74,0x74,0x65,0x72,0x6e,0x22, + 0x2f,0x3e,0x0a,0x20,0x20,0x3c,0x2f,0x66,0x6f,0x72,0x6d,0x3e,0x0a,0x3c,0x2f,0x73, + 0x70,0x61,0x6e,0x3e,0x0a,0x3c,0x64,0x69,0x76,0x20,0x73,0x74,0x79,0x6c,0x65,0x3d, + 0x22,0x64,0x69,0x73,0x70,0x6c,0x61,0x79,0x3a,0x20,0x62,0x6c,0x6f,0x63,0x6b,0x3b, + 0x20,0x68,0x65,0x69,0x67,0x68,0x74,0x3a,0x20,0x34,0x30,0x70,0x78,0x3b,0x22,0x3e, + 0x3c,0x2f,0x64,0x69,0x76,0x3e,0x0a }; static std::map > createResourceMap() { diff --git a/static/server/taskbar.html.part b/static/server/taskbar.html.part index 0ea2f3580..327bf887f 100644 --- a/static/server/taskbar.html.part +++ b/static/server/taskbar.html.part @@ -3,6 +3,8 @@ $( "#kiwixsearchbox" ).autocomplete({ source: "/suggest?content=__CONTENT__", + dataType: "json", + cache: false, select: function(event, ui) { $( "#kiwixsearchform" ).submit();