git.iko.soy/unity8
on xenial help sign in
Do not use the same filepath parameter for all the card creator createQmlObject calls
a78e41bAlbert Astals Cid
plugins/Dash/CardCreator.js+2−2
compare with xenial
unifiedsplit
@@ -825,7 +825,7 @@ function cardString(template, components) {
825 return code;
825 return code;
826}
826}
827
827
828−function createCardComponent(parent, template, components) {
828+function createCardComponent(parent, template, components, identifier) {
829 var imports = 'import QtQuick 2.4; \n\
829 var imports = 'import QtQuick 2.4; \n\
830 import Ubuntu.Components 1.3; \n\
830 import Ubuntu.Components 1.3; \n\
831 import Ubuntu.Settings.Components 0.1; \n\
831 import Ubuntu.Settings.Components 0.1; \n\
@@ -835,7 +835,7 @@ function createCardComponent(parent, template, components) {
835 var code = imports + 'Component {\n' + card + '}\n';
835 var code = imports + 'Component {\n' + card + '}\n';
836
836
837 try {
837 try {
838− return Qt.createQmlObject(code, parent, "createCardComponent");
838+ return Qt.createQmlObject(code, parent, identifier);
839 } catch (e) {
839 } catch (e) {
840 console.error("ERROR: Invalid component created.");
840 console.error("ERROR: Invalid component created.");
841 console.error("Template:");
841 console.error("Template:");
plugins/Dash/CardCreatorCache.qml+1−1
@@ -32,7 +32,7 @@ QtObject {
32 var allString = tString + cString;
32 var allString = tString + cString;
33 var component = cache[allString];
33 var component = cache[allString];
34 if (component === undefined) {
34 if (component === undefined) {
35− component = CardCreator.createCardComponent(root, template, components);
35+ component = CardCreator.createCardComponent(root, template, components, allString);
36 cache[allString] = component;
36 cache[allString] = component;
37 }
37 }
38 return component;
38 return component;