Skip to content

Commit

Permalink
fix overrides and fix move to local document
Browse files Browse the repository at this point in the history
  • Loading branch information
ahmedmigo committed Apr 24, 2019
1 parent d0eae7d commit 61cc249
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 3 deletions.
2 changes: 1 addition & 1 deletion move-to-library.sketchplugin/Contents/Sketch/manifest.json
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"icon": "icon-sr.png" "icon": "icon-sr.png"
} }
], ],
"version": "2.2.8", "version": "2.2.9",
"disableCocoaScriptPreprocessor": true, "disableCocoaScriptPreprocessor": true,
"appcast": "https://raw.githubusercontent.com//master/.appcast.xml" "appcast": "https://raw.githubusercontent.com//master/.appcast.xml"
} }
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -12848,7 +12848,7 @@ function moveSelectedInstancetToLocalDoc(context) {
var instances = context.selection[k].symbolMaster().allInstances().allObjects(); var instances = context.selection[k].symbolMaster().allInstances().allObjects();


for (var i = 0; i < instances.count(); i++) { for (var i = 0; i < instances.count(); i++) {
instances[i].changeInstanceToSymbol(symbolMaster); instances[i].changeInstanceToSymbol(symbolMasterCopy);
} }
} else { } else {
context.api().message("layer selected is not Symbol from library 🤔"); context.api().message("layer selected is not Symbol from library 🤔");
Expand Down Expand Up @@ -12974,10 +12974,14 @@ function AddSymbolToDoc(context, symbol, symbolsInDocByName, doc, library, local


for (var i = 0; i < symbolChildren.count(); i++) { for (var i = 0; i < symbolChildren.count(); i++) {
if (symbolChildren[i].class() == MSSymbolInstance) { if (symbolChildren[i].class() == MSSymbolInstance) {
var oldOverrides = symbolChildren[i].overrides();
symbolsInDocByName = replaceInstance(context, symbol.children()[i], symbolsInDocByName, library); symbolsInDocByName = replaceInstance(context, symbol.children()[i], symbolsInDocByName, library);
LOG(symbolChildren[i].symbolMaster() + "🎉"); LOG(symbolChildren[i].symbolMaster() + "🎉");
var childMaster = symbolsInDocByName[symbolChildren[i].symbolMaster().name()]; var childMaster = symbolsInDocByName[symbolChildren[i].symbolMaster().name()];
symbolCopy.children()[i].changeInstanceToSymbol(childMaster); symbolCopy.children()[i].changeInstanceToSymbol(childMaster);
log("🌚" + symbolCopy.children()[i].overrides());
symbolCopy.children()[i].overrides = oldOverrides;
log("🌕" + symbolCopy.children()[i].overrides());
} }
} }


Expand Down Expand Up @@ -13061,6 +13065,8 @@ function reattachAllInstance(context, symbol, foreignSymbol) {
var instanceArray = Instances.allObjects(); var instanceArray = Instances.allObjects();


for (var i = 0; i < instanceArray.count(); i++) { for (var i = 0; i < instanceArray.count(); i++) {
var oldOverrides = instanceArray[i].overrides();

if (instanceArray[i].symbolMaster() == symbol) { if (instanceArray[i].symbolMaster() == symbol) {
// var presentatge = i / Instances.count() * 100; // var presentatge = i / Instances.count() * 100;
// browserWindow.webContents.executeJavaScript( // browserWindow.webContents.executeJavaScript(
Expand All @@ -13080,6 +13086,7 @@ function reattachAllInstance(context, symbol, foreignSymbol) {
movedInstancesNumber++; movedInstancesNumber++;
} }


instanceArray[i].overrides = oldOverrides;
instanceArray[i].updateOverridesWithObjectIDMap(idmap); //printIDMaping(overrideMapID) instanceArray[i].updateOverridesWithObjectIDMap(idmap); //printIDMaping(overrideMapID)
//symbol.removeFromParent() //symbol.removeFromParent()
} }
Expand Down

Large diffs are not rendered by default.

0 comments on commit 61cc249

Please sign in to comment.