Merge lp:~jonas-drange/online-services-common-js/1321267-add-missing-searchbar-requirement into lp:online-services-common-js
- 1321267-add-missing-searchbar-requirement
- Merge into trunk
Proposed by
Jonas G. Drange
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Jonas G. Drange | ||||
Approved revision: | 35 | ||||
Merged at revision: | 35 | ||||
Proposed branch: | lp:~jonas-drange/online-services-common-js/1321267-add-missing-searchbar-requirement | ||||
Merge into: | lp:online-services-common-js | ||||
Diff against target: |
76 lines (+11/-7) 7 files modified
build/config.js (+1/-1) build/searchbar-autocomplete/searchbar-autocomplete-coverage.js (+2/-2) build/searchbar-autocomplete/searchbar-autocomplete-debug.js (+1/-1) build/searchbar-autocomplete/searchbar-autocomplete-min.js (+1/-1) build/searchbar-autocomplete/searchbar-autocomplete.js (+1/-1) src/searchbar/build.json (+2/-1) src/searchbar/tests/unit/js/tests.js (+3/-0) |
||||
To merge this branch: | bzr merge lp:~jonas-drange/online-services-common-js/1321267-add-missing-searchbar-requirement | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Jonas G. Drange (community) | Approve | ||
Review via email: mp+220251@code.launchpad.net |
Commit message
makes phraseHightlighting work
Description of the change
To post a comment you must log in.
Revision history for this message
Jonas G. Drange (jonas-drange) : | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'build/config.js' |
2 | --- build/config.js 2014-05-13 11:03:26 +0000 |
3 | +++ build/config.js 2014-05-20 12:59:27 +0000 |
4 | @@ -1,1 +1,1 @@ |
5 | -YUI.GlobalConfig = {"groups":{"os":{"modules":{"carousel":{"skinnable":true,"requires":["base","node","anim","event"]},"ga-tracking":{"requires":["node"]},"global-navigation-templates":{"requires":["template"]},"global-navigation":{"requires":["node","template","array-extras","global-navigation-templates"],"skinnable":true},"html5-details":{"requires":["base","node","event"]},"myapps-hud":{"skinnable":true,"requires":["node"]},"navbar":{"requires":["node","plugin-collapse"]},"overlay-extras":{"requires":["overlay","plugin","event-resize","event-outside"]},"password-meter":{"requires":["base","widget","event-key","transition"],"skinnable":true},"plugin-collapse":{"requires":["base","plugin","node-pluginhost","transition"]},"plugin-jit-bar":{"requires":["anim","node","node-scroll-info","plugin"],"skinnable":true},"rangyinputs":{},"searchbar-autocomplete":{"requires":["node","autocomplete"]},"uploader-augmented":{"requires":["array-extras","uploader-html5"]},"uploader-follow":{"requires":["base","anim"]},"uploader-myapps-packages-for-extraction":{"requires":["base","uploader-myapps-packages","util","cookie","io","json-parse"]},"uploader-myapps-packages":{"requires":["base","uploader-myapps","util","cookie","io","json-parse"]},"uploader-myapps-templates":{"requires":["template"]},"uploader-myapps":{"skinnable":true,"requires":["template","uploader-augmented","uploader-myapps-templates","node"]},"util-share":{"requires":["base","node"]},"util-stacktrace":{"requires":[]},"util-oops":{"requires":["base","io-base","json-stringify"]},"util-myapps":{"skinnable":true,"requires":["base","node"]},"util":{"use":["util-share","util-stacktrace","util-oops","util-myapps"]},"widget-cc-input":{"requires":["node-pluginhost","widget","base","transition","button","rangyinputs","template"],"skinnable":true},"position-sticky":{"requires":["widget","substitute","node","event-resize"]},"widget-tooltip":{"requires":["event-mouseenter","widget","widget-position","widget-position-align","widget-stack","escape"],"skinnable":true}}}}}; |
6 | \ No newline at end of file |
7 | +YUI.GlobalConfig = {"groups":{"os":{"modules":{"carousel":{"skinnable":true,"requires":["base","node","anim","event"]},"ga-tracking":{"requires":["node"]},"global-navigation-templates":{"requires":["template"]},"global-navigation":{"requires":["node","template","array-extras","global-navigation-templates"],"skinnable":true},"html5-details":{"requires":["base","node","event"]},"myapps-hud":{"skinnable":true,"requires":["node"]},"navbar":{"requires":["node","plugin-collapse"]},"overlay-extras":{"requires":["overlay","plugin","event-resize","event-outside"]},"password-meter":{"requires":["base","widget","event-key","transition"],"skinnable":true},"plugin-collapse":{"requires":["base","plugin","node-pluginhost","transition"]},"plugin-jit-bar":{"requires":["anim","node","node-scroll-info","plugin"],"skinnable":true},"rangyinputs":{},"searchbar-autocomplete":{"requires":["node","autocomplete","autocomplete-highlighters"]},"uploader-augmented":{"requires":["array-extras","uploader-html5"]},"uploader-follow":{"requires":["base","anim"]},"uploader-myapps-packages-for-extraction":{"requires":["base","uploader-myapps-packages","util","cookie","io","json-parse"]},"uploader-myapps-packages":{"requires":["base","uploader-myapps","util","cookie","io","json-parse"]},"uploader-myapps-templates":{"requires":["template"]},"uploader-myapps":{"skinnable":true,"requires":["template","uploader-augmented","uploader-myapps-templates","node"]},"util-share":{"requires":["base","node"]},"util-stacktrace":{"requires":[]},"util-oops":{"requires":["base","io-base","json-stringify"]},"util-myapps":{"skinnable":true,"requires":["base","node"]},"util":{"use":["util-share","util-stacktrace","util-oops","util-myapps"]},"widget-cc-input":{"requires":["node-pluginhost","widget","base","transition","button","rangyinputs","template"],"skinnable":true},"position-sticky":{"requires":["widget","substitute","node","event-resize"]},"widget-tooltip":{"requires":["event-mouseenter","widget","widget-position","widget-position-align","widget-stack","escape"],"skinnable":true}}}}}; |
8 | \ No newline at end of file |
9 | |
10 | === modified file 'build/searchbar-autocomplete/searchbar-autocomplete-coverage.js' |
11 | --- build/searchbar-autocomplete/searchbar-autocomplete-coverage.js 2014-05-14 09:49:12 +0000 |
12 | +++ build/searchbar-autocomplete/searchbar-autocomplete-coverage.js 2014-05-20 12:59:27 +0000 |
13 | @@ -1,6 +1,6 @@ |
14 | if (typeof __coverage__ === 'undefined') { __coverage__ = {}; } |
15 | if (!__coverage__['build/searchbar-autocomplete/searchbar-autocomplete.js']) { |
16 | - __coverage__['build/searchbar-autocomplete/searchbar-autocomplete.js'] = {"path":"build/searchbar-autocomplete/searchbar-autocomplete.js","s":{"1":0,"2":0,"3":0,"4":0,"5":0,"6":0,"7":0,"8":0,"9":0,"10":0,"11":0,"12":0,"13":0,"14":0,"15":0,"16":0},"b":{"1":[0,0]},"f":{"1":0,"2":0,"3":0,"4":0},"fnMap":{"1":{"name":"(anonymous_1)","line":1,"loc":{"start":{"line":1,"column":34},"end":{"line":1,"column":53}}},"2":{"name":"(anonymous_2)","line":4,"loc":{"start":{"line":4,"column":1},"end":{"line":4,"column":13}}},"3":{"name":"(anonymous_3)","line":8,"loc":{"start":{"line":8,"column":16},"end":{"line":8,"column":35}}},"4":{"name":"(anonymous_4)","line":34,"loc":{"start":{"line":34,"column":37},"end":{"line":34,"column":50}}}},"statementMap":{"1":{"start":{"line":1,"column":0},"end":{"line":43,"column":52}},"2":{"start":{"line":4,"column":0},"end":{"line":40,"column":5}},"3":{"start":{"line":6,"column":0},"end":{"line":6,"column":41}},"4":{"start":{"line":8,"column":0},"end":{"line":38,"column":3}},"5":{"start":{"line":11,"column":4},"end":{"line":11,"column":14}},"6":{"start":{"line":13,"column":4},"end":{"line":13,"column":24}},"7":{"start":{"line":15,"column":4},"end":{"line":15,"column":45}},"8":{"start":{"line":16,"column":4},"end":{"line":18,"column":5}},"9":{"start":{"line":17,"column":8},"end":{"line":17,"column":57}},"10":{"start":{"line":21,"column":4},"end":{"line":25,"column":7}},"11":{"start":{"line":28,"column":4},"end":{"line":28,"column":50}},"12":{"start":{"line":29,"column":4},"end":{"line":29,"column":74}},"13":{"start":{"line":30,"column":4},"end":{"line":30,"column":60}},"14":{"start":{"line":31,"column":4},"end":{"line":31,"column":46}},"15":{"start":{"line":34,"column":4},"end":{"line":36,"column":7}},"16":{"start":{"line":35,"column":8},"end":{"line":35,"column":54}}},"branchMap":{"1":{"line":16,"type":"if","locations":[{"start":{"line":16,"column":4},"end":{"line":16,"column":4}},{"start":{"line":16,"column":4},"end":{"line":16,"column":4}}]}},"code":["(function () { YUI.add('searchbar-autocomplete', function (Y, NAME) {","","\"use strict\";","(function () {","","var searchbars = Y.all('.ues-searchbar');","","searchbars.each(function (node, i) {",""," // input which has autocomplete plugin"," var input;"," // autocomplete boundingbox"," var autoCompleteBox;",""," input = node.one('input[type=\"search\"]');"," if (!input) {"," throw new Error('autocomplete is missing input');"," }",""," // plug autocomplete"," input.plug(Y.Plugin.AutoComplete, {"," resultTextLocator: 'text',"," resultHighlighter: 'phraseMatch',"," tabSelect: true"," });",""," // add ues classes"," autoCompleteBox = input.ac.get('boundingBox');"," autoCompleteBox.addClass('ues-autocomplete').addClass('ues-dropdown');"," autoCompleteBox.one('ul').addClass('ues-dropdown-menu');"," autoCompleteBox.setStyle('width', '100%');",""," // make ac control the visibility of the ues-dropdown"," input.ac.before('visibleChange', function (e) {"," autoCompleteBox.toggleClass('open', e.newVal);"," });","","});","","})();","","","}, '0.1.0', {\"requires\": [\"node\", \"autocomplete\"]});","","}());"]}; |
17 | + __coverage__['build/searchbar-autocomplete/searchbar-autocomplete.js'] = {"path":"build/searchbar-autocomplete/searchbar-autocomplete.js","s":{"1":0,"2":0,"3":0,"4":0,"5":0,"6":0,"7":0,"8":0,"9":0,"10":0,"11":0,"12":0,"13":0,"14":0,"15":0,"16":0},"b":{"1":[0,0]},"f":{"1":0,"2":0,"3":0,"4":0},"fnMap":{"1":{"name":"(anonymous_1)","line":1,"loc":{"start":{"line":1,"column":34},"end":{"line":1,"column":53}}},"2":{"name":"(anonymous_2)","line":4,"loc":{"start":{"line":4,"column":1},"end":{"line":4,"column":13}}},"3":{"name":"(anonymous_3)","line":8,"loc":{"start":{"line":8,"column":16},"end":{"line":8,"column":35}}},"4":{"name":"(anonymous_4)","line":34,"loc":{"start":{"line":34,"column":37},"end":{"line":34,"column":50}}}},"statementMap":{"1":{"start":{"line":1,"column":0},"end":{"line":43,"column":81}},"2":{"start":{"line":4,"column":0},"end":{"line":40,"column":5}},"3":{"start":{"line":6,"column":0},"end":{"line":6,"column":41}},"4":{"start":{"line":8,"column":0},"end":{"line":38,"column":3}},"5":{"start":{"line":11,"column":4},"end":{"line":11,"column":14}},"6":{"start":{"line":13,"column":4},"end":{"line":13,"column":24}},"7":{"start":{"line":15,"column":4},"end":{"line":15,"column":45}},"8":{"start":{"line":16,"column":4},"end":{"line":18,"column":5}},"9":{"start":{"line":17,"column":8},"end":{"line":17,"column":57}},"10":{"start":{"line":21,"column":4},"end":{"line":25,"column":7}},"11":{"start":{"line":28,"column":4},"end":{"line":28,"column":50}},"12":{"start":{"line":29,"column":4},"end":{"line":29,"column":74}},"13":{"start":{"line":30,"column":4},"end":{"line":30,"column":60}},"14":{"start":{"line":31,"column":4},"end":{"line":31,"column":46}},"15":{"start":{"line":34,"column":4},"end":{"line":36,"column":7}},"16":{"start":{"line":35,"column":8},"end":{"line":35,"column":54}}},"branchMap":{"1":{"line":16,"type":"if","locations":[{"start":{"line":16,"column":4},"end":{"line":16,"column":4}},{"start":{"line":16,"column":4},"end":{"line":16,"column":4}}]}},"code":["(function () { YUI.add('searchbar-autocomplete', function (Y, NAME) {","","\"use strict\";","(function () {","","var searchbars = Y.all('.ues-searchbar');","","searchbars.each(function (node, i) {",""," // input which has autocomplete plugin"," var input;"," // autocomplete boundingbox"," var autoCompleteBox;",""," input = node.one('input[type=\"search\"]');"," if (!input) {"," throw new Error('autocomplete is missing input');"," }",""," // plug autocomplete"," input.plug(Y.Plugin.AutoComplete, {"," resultTextLocator: 'text',"," resultHighlighter: 'phraseMatch',"," tabSelect: true"," });",""," // add ues classes"," autoCompleteBox = input.ac.get('boundingBox');"," autoCompleteBox.addClass('ues-autocomplete').addClass('ues-dropdown');"," autoCompleteBox.one('ul').addClass('ues-dropdown-menu');"," autoCompleteBox.setStyle('width', '100%');",""," // make ac control the visibility of the ues-dropdown"," input.ac.before('visibleChange', function (e) {"," autoCompleteBox.toggleClass('open', e.newVal);"," });","","});","","})();","","","}, '0.1.0', {\"requires\": [\"node\", \"autocomplete\", \"autocomplete-highlighters\"]});","","}());"]}; |
18 | } |
19 | var __cov_g0Tq0C64FsLqcF2cRssBmw = __coverage__['build/searchbar-autocomplete/searchbar-autocomplete.js']; |
20 | -__cov_g0Tq0C64FsLqcF2cRssBmw.s['1']++;YUI.add('searchbar-autocomplete',function(Y,NAME){'use strict';__cov_g0Tq0C64FsLqcF2cRssBmw.f['1']++;__cov_g0Tq0C64FsLqcF2cRssBmw.s['2']++;(function(){__cov_g0Tq0C64FsLqcF2cRssBmw.f['2']++;__cov_g0Tq0C64FsLqcF2cRssBmw.s['3']++;var searchbars=Y.all('.ues-searchbar');__cov_g0Tq0C64FsLqcF2cRssBmw.s['4']++;searchbars.each(function(node,i){__cov_g0Tq0C64FsLqcF2cRssBmw.f['3']++;__cov_g0Tq0C64FsLqcF2cRssBmw.s['5']++;var input;__cov_g0Tq0C64FsLqcF2cRssBmw.s['6']++;var autoCompleteBox;__cov_g0Tq0C64FsLqcF2cRssBmw.s['7']++;input=node.one('input[type="search"]');__cov_g0Tq0C64FsLqcF2cRssBmw.s['8']++;if(!input){__cov_g0Tq0C64FsLqcF2cRssBmw.b['1'][0]++;__cov_g0Tq0C64FsLqcF2cRssBmw.s['9']++;throw new Error('autocomplete is missing input');}else{__cov_g0Tq0C64FsLqcF2cRssBmw.b['1'][1]++;}__cov_g0Tq0C64FsLqcF2cRssBmw.s['10']++;input.plug(Y.Plugin.AutoComplete,{resultTextLocator:'text',resultHighlighter:'phraseMatch',tabSelect:true});__cov_g0Tq0C64FsLqcF2cRssBmw.s['11']++;autoCompleteBox=input.ac.get('boundingBox');__cov_g0Tq0C64FsLqcF2cRssBmw.s['12']++;autoCompleteBox.addClass('ues-autocomplete').addClass('ues-dropdown');__cov_g0Tq0C64FsLqcF2cRssBmw.s['13']++;autoCompleteBox.one('ul').addClass('ues-dropdown-menu');__cov_g0Tq0C64FsLqcF2cRssBmw.s['14']++;autoCompleteBox.setStyle('width','100%');__cov_g0Tq0C64FsLqcF2cRssBmw.s['15']++;input.ac.before('visibleChange',function(e){__cov_g0Tq0C64FsLqcF2cRssBmw.f['4']++;__cov_g0Tq0C64FsLqcF2cRssBmw.s['16']++;autoCompleteBox.toggleClass('open',e.newVal);});});}());},'0.1.0',{'requires':['node','autocomplete']}); |
21 | +__cov_g0Tq0C64FsLqcF2cRssBmw.s['1']++;YUI.add('searchbar-autocomplete',function(Y,NAME){'use strict';__cov_g0Tq0C64FsLqcF2cRssBmw.f['1']++;__cov_g0Tq0C64FsLqcF2cRssBmw.s['2']++;(function(){__cov_g0Tq0C64FsLqcF2cRssBmw.f['2']++;__cov_g0Tq0C64FsLqcF2cRssBmw.s['3']++;var searchbars=Y.all('.ues-searchbar');__cov_g0Tq0C64FsLqcF2cRssBmw.s['4']++;searchbars.each(function(node,i){__cov_g0Tq0C64FsLqcF2cRssBmw.f['3']++;__cov_g0Tq0C64FsLqcF2cRssBmw.s['5']++;var input;__cov_g0Tq0C64FsLqcF2cRssBmw.s['6']++;var autoCompleteBox;__cov_g0Tq0C64FsLqcF2cRssBmw.s['7']++;input=node.one('input[type="search"]');__cov_g0Tq0C64FsLqcF2cRssBmw.s['8']++;if(!input){__cov_g0Tq0C64FsLqcF2cRssBmw.b['1'][0]++;__cov_g0Tq0C64FsLqcF2cRssBmw.s['9']++;throw new Error('autocomplete is missing input');}else{__cov_g0Tq0C64FsLqcF2cRssBmw.b['1'][1]++;}__cov_g0Tq0C64FsLqcF2cRssBmw.s['10']++;input.plug(Y.Plugin.AutoComplete,{resultTextLocator:'text',resultHighlighter:'phraseMatch',tabSelect:true});__cov_g0Tq0C64FsLqcF2cRssBmw.s['11']++;autoCompleteBox=input.ac.get('boundingBox');__cov_g0Tq0C64FsLqcF2cRssBmw.s['12']++;autoCompleteBox.addClass('ues-autocomplete').addClass('ues-dropdown');__cov_g0Tq0C64FsLqcF2cRssBmw.s['13']++;autoCompleteBox.one('ul').addClass('ues-dropdown-menu');__cov_g0Tq0C64FsLqcF2cRssBmw.s['14']++;autoCompleteBox.setStyle('width','100%');__cov_g0Tq0C64FsLqcF2cRssBmw.s['15']++;input.ac.before('visibleChange',function(e){__cov_g0Tq0C64FsLqcF2cRssBmw.f['4']++;__cov_g0Tq0C64FsLqcF2cRssBmw.s['16']++;autoCompleteBox.toggleClass('open',e.newVal);});});}());},'0.1.0',{'requires':['node','autocomplete','autocomplete-highlighters']}); |
22 | |
23 | === modified file 'build/searchbar-autocomplete/searchbar-autocomplete-debug.js' |
24 | --- build/searchbar-autocomplete/searchbar-autocomplete-debug.js 2014-05-14 09:49:12 +0000 |
25 | +++ build/searchbar-autocomplete/searchbar-autocomplete-debug.js 2014-05-20 12:59:27 +0000 |
26 | @@ -40,4 +40,4 @@ |
27 | })(); |
28 | |
29 | |
30 | -}, '0.1.0', {"requires": ["node", "autocomplete"]}); |
31 | +}, '0.1.0', {"requires": ["node", "autocomplete", "autocomplete-highlighters"]}); |
32 | |
33 | === modified file 'build/searchbar-autocomplete/searchbar-autocomplete-min.js' |
34 | --- build/searchbar-autocomplete/searchbar-autocomplete-min.js 2014-05-14 09:49:12 +0000 |
35 | +++ build/searchbar-autocomplete/searchbar-autocomplete-min.js 2014-05-20 12:59:27 +0000 |
36 | @@ -1,1 +1,1 @@ |
37 | -YUI.add("searchbar-autocomplete",function(e,t){"use strict";(function(){var t=e.all(".ues-searchbar");t.each(function(t,n){var r,i;r=t.one('input[type="search"]');if(!r)throw new Error("autocomplete is missing input");r.plug(e.Plugin.AutoComplete,{resultTextLocator:"text",resultHighlighter:"phraseMatch",tabSelect:!0}),i=r.ac.get("boundingBox"),i.addClass("ues-autocomplete").addClass("ues-dropdown"),i.one("ul").addClass("ues-dropdown-menu"),i.setStyle("width","100%"),r.ac.before("visibleChange",function(e){i.toggleClass("open",e.newVal)})})})()},"0.1.0",{requires:["node","autocomplete"]}); |
38 | +YUI.add("searchbar-autocomplete",function(e,t){"use strict";(function(){var t=e.all(".ues-searchbar");t.each(function(t,n){var r,i;r=t.one('input[type="search"]');if(!r)throw new Error("autocomplete is missing input");r.plug(e.Plugin.AutoComplete,{resultTextLocator:"text",resultHighlighter:"phraseMatch",tabSelect:!0}),i=r.ac.get("boundingBox"),i.addClass("ues-autocomplete").addClass("ues-dropdown"),i.one("ul").addClass("ues-dropdown-menu"),i.setStyle("width","100%"),r.ac.before("visibleChange",function(e){i.toggleClass("open",e.newVal)})})})()},"0.1.0",{requires:["node","autocomplete","autocomplete-highlighters"]}); |
39 | |
40 | === modified file 'build/searchbar-autocomplete/searchbar-autocomplete.js' |
41 | --- build/searchbar-autocomplete/searchbar-autocomplete.js 2014-05-14 09:49:12 +0000 |
42 | +++ build/searchbar-autocomplete/searchbar-autocomplete.js 2014-05-20 12:59:27 +0000 |
43 | @@ -40,4 +40,4 @@ |
44 | })(); |
45 | |
46 | |
47 | -}, '0.1.0', {"requires": ["node", "autocomplete"]}); |
48 | +}, '0.1.0', {"requires": ["node", "autocomplete", "autocomplete-highlighters"]}); |
49 | |
50 | === modified file 'src/searchbar/build.json' |
51 | --- src/searchbar/build.json 2014-05-13 11:13:46 +0000 |
52 | +++ src/searchbar/build.json 2014-05-20 12:59:27 +0000 |
53 | @@ -12,7 +12,8 @@ |
54 | "config": { |
55 | "requires": [ |
56 | "node", |
57 | - "autocomplete" |
58 | + "autocomplete", |
59 | + "autocomplete-highlighters" |
60 | ] |
61 | } |
62 | } |
63 | |
64 | === modified file 'src/searchbar/tests/unit/js/tests.js' |
65 | --- src/searchbar/tests/unit/js/tests.js 2014-05-13 11:03:26 +0000 |
66 | +++ src/searchbar/tests/unit/js/tests.js 2014-05-20 12:59:27 +0000 |
67 | @@ -60,6 +60,9 @@ |
68 | |
69 | }); |
70 | |
71 | + it('should require highlighters module', function () { |
72 | + expect(Y.Env.meta.modules['autocomplete-highlighters']).to.be.ok; |
73 | + }); |
74 | }); |
75 | |
76 | }); |