Browse Source

trappedLabel

Herbert Vojčík 6 years ago
parent
commit
c4d10d42ae
2 changed files with 65 additions and 8 deletions
  1. 52 6
      src/Trapped.js
  2. 13 2
      src/Trapped.st

+ 52 - 6
src/Trapped.js

@@ -1,8 +1,8 @@
 define(["amber/boot"
 //>>excludeStart("imports", pragmas.excludeImports);
-, "amber/web/Web", "axxord/Axxord"
+, "amber/web/Web"
 //>>excludeEnd("imports");
-, "amber/web/Web", "amber_core/Kernel-Collections", "amber_core/Kernel-Objects"], function($boot
+, "amber/web/Web", "amber_core/Kernel-Collections", "amber_core/Kernel-Objects", "axxord/Axxord"], function($boot
 //>>excludeStart("imports", pragmas.excludeImports);
 
 //>>excludeEnd("imports");
@@ -13,7 +13,7 @@ var $core=$boot.api,nil=$boot.nilAsValue,$nil=$boot.nilAsReceiver,$recv=$boot.as
 if(!$boot.nilAsClass)$boot.nilAsClass=$boot.dnu;
 $core.addPackage("Trapped");
 $core.packages["Trapped"].innerEval = function (expr) { return eval(expr); };
-$core.packages["Trapped"].imports = ["amber/web/Web", "axxord/Axxord"];
+$core.packages["Trapped"].imports = ["amber/web/Web"];
 $core.packages["Trapped"].transport = {"type":"amd","amdNamespace":"trapped"};
 
 $core.addClass("TrappedDataCarrier", $globals.Object, ["target", "model", "chain"], "Trapped");
@@ -1394,7 +1394,7 @@ var self=this,$self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-$self._register_name_(aListKeyedEntity,$recv($recv(aListKeyedEntity)._class())._name());
+$self._register_name_(aListKeyedEntity,$recv(aListKeyedEntity)._trappedLabel());
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"register:",{aListKeyedEntity:aListKeyedEntity},$globals.Trapped)});
@@ -1402,10 +1402,10 @@ return self;
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
 args: ["aListKeyedEntity"],
-source: "register: aListKeyedEntity\x0a\x09self register: aListKeyedEntity name: aListKeyedEntity class name",
+source: "register: aListKeyedEntity\x0a\x09self register: aListKeyedEntity name: aListKeyedEntity trappedLabel",
 referencedClasses: [],
 //>>excludeEnd("ide");
-messageSends: ["register:name:", "name", "class"]
+messageSends: ["register:name:", "trappedLabel"]
 }),
 $globals.Trapped);
 
@@ -1820,6 +1820,29 @@ messageSends: ["descend:snapshotDo:", "current"]
 }),
 $globals.Array);
 
+$core.addMethod(
+$core.method({
+selector: "trappedLabel",
+protocol: "*Trapped",
+fn: function (){
+var self=this,$self=this;
+//>>excludeStart("ctx", pragmas.excludeDebugContexts);
+return $core.withContext(function($ctx1) {
+//>>excludeEnd("ctx");
+return $recv($self["@root"])._trappedLabel();
+//>>excludeStart("ctx", pragmas.excludeDebugContexts);
+}, function($ctx1) {$ctx1.fill(self,"trappedLabel",{},$globals.Axolator)});
+//>>excludeEnd("ctx");
+},
+//>>excludeStart("ide", pragmas.excludeIdeData);
+args: [],
+source: "trappedLabel\x0a\x0a^ root trappedLabel",
+referencedClasses: [],
+//>>excludeEnd("ide");
+messageSends: ["trappedLabel"]
+}),
+$globals.Axolator);
+
 $core.addMethod(
 $core.method({
 selector: "trapIter:do:",
@@ -1884,6 +1907,29 @@ messageSends: ["error:", ",", "name", "class"]
 }),
 $globals.Object);
 
+$core.addMethod(
+$core.method({
+selector: "trappedLabel",
+protocol: "*Trapped",
+fn: function (){
+var self=this,$self=this;
+//>>excludeStart("ctx", pragmas.excludeDebugContexts);
+return $core.withContext(function($ctx1) {
+//>>excludeEnd("ctx");
+return $recv($self._class())._name();
+//>>excludeStart("ctx", pragmas.excludeDebugContexts);
+}, function($ctx1) {$ctx1.fill(self,"trappedLabel",{},$globals.Object)});
+//>>excludeEnd("ctx");
+},
+//>>excludeStart("ide", pragmas.excludeIdeData);
+args: [],
+source: "trappedLabel\x0a\x09^ self class name",
+referencedClasses: [],
+//>>excludeEnd("ide");
+messageSends: ["name", "class"]
+}),
+$globals.Object);
+
 $core.addMethod(
 $core.method({
 selector: "asTrapProcSendTo:",

+ 13 - 2
src/Trapped.st

@@ -1,5 +1,5 @@
 Smalltalk createPackage: 'Trapped'!
-(Smalltalk packageAt: 'Trapped') imports: {'amber/web/Web'. 'axxord/Axxord'}!
+(Smalltalk packageAt: 'Trapped') imports: {'amber/web/Web'}!
 Object subclass: #TrappedDataCarrier
 	instanceVariableNames: 'target model chain'
 	package: 'Trapped'!
@@ -355,7 +355,7 @@ byName: aString
 !
 
 register: aListKeyedEntity
-	self register: aListKeyedEntity name: aListKeyedEntity class name
+	self register: aListKeyedEntity name: aListKeyedEntity trappedLabel
 !
 
 register: aListKeyedEntity name: aString
@@ -492,6 +492,13 @@ trapDescend: aBlock
 	Trapped current descend: self snapshotDo: aBlock
 ! !
 
+!Axolator methodsFor: '*Trapped'!
+
+trappedLabel
+
+^ root trappedLabel
+! !
+
 !HTMLCanvas methodsFor: '*Trapped'!
 
 trapIter: path do: aBlock
@@ -502,6 +509,10 @@ trapIter: path do: aBlock
 
 asTrapProcSendTo: anObject
 	self error: 'Trapped cannot use processor descriptor of ', self class name, ' type.'
+!
+
+trappedLabel
+	^ self class name
 ! !
 
 !String methodsFor: '*Trapped'!