|
@@ -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:",
|