@@ -1,5 +1,5 @@
11/*
2− * Copyright 2013,2015 Canonical Ltd.
2+ * Copyright 2013-2016 Canonical Ltd.
33 *
44 * This program is free software; you can redistribute it and/or modify
55 * it under the terms of the GNU Lesser General Public License as published by
@@ -93,6 +93,10 @@ Item {
9393 var map = _userMap || _typeToComponent
9494 var indicatorComponents = map[indicator];
9595
96+ if (type === undefined || type === "") {
97+ return component
98+ }
99+
96100 if (indicatorComponents !== undefined) {
97101 component = indicatorComponents[type];
98102 }
@@ -101,6 +105,10 @@ Item {
101105 component = map["default"][type];
102106 }
103107
108+ if (component === undefined) {
109+ console.debug("Don't know how to make " + modelData.type + " for " + indicator);
110+ }
111+
104112 return component
105113 }
106114
@@ -108,6 +116,10 @@ Item {
108116 var component = undefined;
109117 var indicatorFilter = _action_filter_map[indicator]
110118
119+ if (action === undefined || action === "") {
120+ return component
121+ }
122+
111123 if (indicatorFilter !== undefined) {
112124 component = indicatorFilter[action];
113125 }
@@ -1000,20 +1012,16 @@ Item {
10001012 if (context && context.indexOf("fake-") == 0)
10011013 context = context.substring("fake-".length)
10021014
1003− if (modelData.action !== undefined && modelData.action !== "") {
1004− var component = getComponentForIndicatorEntryAction(context, modelData.action)
1005− if (component !== undefined) {
1006− return component
1007− }
1015+ var component = getComponentForIndicatorEntryAction(context, modelData.action)
1016+ if (component !== undefined) {
1017+ return component
10081018 }
10091019
1010− if (modelData.type !== undefined && modelData.type !== "") {
1011− var component = getComponentForIndicatorEntryType(context, modelData.type)
1012− if (component !== undefined) {
1013− return component;
1014− }
1015− console.debug("Don't know how to make " + modelData.type + " for " + context);
1020+ component = getComponentForIndicatorEntryType(context, modelData.type)
1021+ if (component !== undefined) {
1022+ return component;
10161023 }
1024+
10171025 if (modelData.isCheck || modelData.isRadio) {
10181026 return checkableMenu;
10191027 }