git.iko.soy/unity8
on xenial help sign in
Do not use the same filepath parameter for all the card creator createQmlObject calls
65de3d7Albert Astals Cid
plugins/Dash/CardCreator.js+2−2
compare with xenial
unifiedsplit
@@ -801,7 +801,7 @@ function cardString(template, components) {
801 return code;
801 return code;
802}
802}
803
803
804−function createCardComponent(parent, template, components) {
804+function createCardComponent(parent, template, components, identifier) {
805 var imports = 'import QtQuick 2.4; \n\
805 var imports = 'import QtQuick 2.4; \n\
806 import Ubuntu.Components 1.3; \n\
806 import Ubuntu.Components 1.3; \n\
807 import Ubuntu.Settings.Components 0.1; \n\
807 import Ubuntu.Settings.Components 0.1; \n\
@@ -811,7 +811,7 @@ function createCardComponent(parent, template, components) {
811 var code = imports + 'Component {\n' + card + '}\n';
811 var code = imports + 'Component {\n' + card + '}\n';
812
812
813 try {
813 try {
814− return Qt.createQmlObject(code, parent, "createCardComponent");
814+ return Qt.createQmlObject(code, parent, identifier);
815 } catch (e) {
815 } catch (e) {
816 console.error("ERROR: Invalid component created.");
816 console.error("ERROR: Invalid component created.");
817 console.error("Template:");
817 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;