Merge branch 'snippet-cleaning' of https://github.com/herby/amber

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

js/Canvas.deploy.js

@@ -1632,41 +1632,15 @@ return self}, function($ctx1) {$ctx1.fill(self,"snippetAt:compile:",{aString:aSt
 }),
 smalltalk.HTMLSnippet);
 
-smalltalk.addMethod(
-"_snippetAt_ifAbsent_",
-smalltalk.method({
-selector: "snippetAt:ifAbsent:",
-fn: function (aString,aBlock){
-var self=this;
-return smalltalk.withContext(function($ctx1) { 
var $1;
-$1=_st(_st(self)._snippets())._at_ifAbsent_(aString,aBlock);
-return $1;
-}, function($ctx1) {$ctx1.fill(self,"snippetAt:ifAbsent:",{aString:aString,aBlock:aBlock}, smalltalk.HTMLSnippet)})}
-}),
-smalltalk.HTMLSnippet);
-
 smalltalk.addMethod(
 "_snippetAt_install_",
 smalltalk.method({
 selector: "snippetAt:install:",
 fn: function (aString,anElement){
 var self=this;
-return smalltalk.withContext(function($ctx1) { 
var $1,$2;
-$1=self;
-_st($1)._snippetAt_put_(aString,anElement);
-$2=_st($1)._snippetAt_compile_(aString,anElement);
-return self}, function($ctx1) {$ctx1.fill(self,"snippetAt:install:",{aString:aString,anElement:anElement}, smalltalk.HTMLSnippet)})}
-}),
-smalltalk.HTMLSnippet);
-
-smalltalk.addMethod(
-"_snippetAt_put_",
-smalltalk.method({
-selector: "snippetAt:put:",
-fn: function (aString,anElement){
-var self=this;
 return smalltalk.withContext(function($ctx1) { 
_st(_st(self)._snippets())._at_put_(aString,anElement);
-return self}, function($ctx1) {$ctx1.fill(self,"snippetAt:put:",{aString:aString,anElement:anElement}, smalltalk.HTMLSnippet)})}
+_st(self)._snippetAt_compile_(aString,anElement);
+return self}, function($ctx1) {$ctx1.fill(self,"snippetAt:install:",{aString:aString,anElement:anElement}, smalltalk.HTMLSnippet)})}
 }),
 smalltalk.HTMLSnippet);
 

js/Canvas.js

@@ -2248,24 +2248,6 @@ referencedClasses: ["HTMLCanvas", "ClassBuilder"]
 }),
 smalltalk.HTMLSnippet);
 
-smalltalk.addMethod(
-"_snippetAt_ifAbsent_",
-smalltalk.method({
-selector: "snippetAt:ifAbsent:",
-category: 'accessing',
-fn: function (aString,aBlock){
-var self=this;
-return smalltalk.withContext(function($ctx1) { 
var $1;
-$1=_st(_st(self)._snippets())._at_ifAbsent_(aString,aBlock);
-return $1;
-}, function($ctx1) {$ctx1.fill(self,"snippetAt:ifAbsent:",{aString:aString,aBlock:aBlock}, smalltalk.HTMLSnippet)})},
-args: ["aString", "aBlock"],
-source: "snippetAt: aString ifAbsent: aBlock\x0a\x09^ self snippets at: aString ifAbsent: aBlock",
-messageSends: ["at:ifAbsent:", "snippets"],
-referencedClasses: []
-}),
-smalltalk.HTMLSnippet);
-
 smalltalk.addMethod(
 "_snippetAt_install_",
 smalltalk.method({
@@ -2273,30 +2255,12 @@ selector: "snippetAt:install:",
 category: 'snippet installation',
 fn: function (aString,anElement){
 var self=this;
-return smalltalk.withContext(function($ctx1) { 
var $1,$2;
-$1=self;
-_st($1)._snippetAt_put_(aString,anElement);
-$2=_st($1)._snippetAt_compile_(aString,anElement);
-return self}, function($ctx1) {$ctx1.fill(self,"snippetAt:install:",{aString:aString,anElement:anElement}, smalltalk.HTMLSnippet)})},
-args: ["aString", "anElement"],
-source: "snippetAt: aString install: anElement\x0a\x09self \x0a    \x09snippetAt: aString put: anElement;\x0a        snippetAt: aString compile: anElement",
-messageSends: ["snippetAt:put:", "snippetAt:compile:"],
-referencedClasses: []
-}),
-smalltalk.HTMLSnippet);
-
-smalltalk.addMethod(
-"_snippetAt_put_",
-smalltalk.method({
-selector: "snippetAt:put:",
-category: 'accessing',
-fn: function (aString,anElement){
-var self=this;
 return smalltalk.withContext(function($ctx1) { 
_st(_st(self)._snippets())._at_put_(aString,anElement);
-return self}, function($ctx1) {$ctx1.fill(self,"snippetAt:put:",{aString:aString,anElement:anElement}, smalltalk.HTMLSnippet)})},
+_st(self)._snippetAt_compile_(aString,anElement);
+return self}, function($ctx1) {$ctx1.fill(self,"snippetAt:install:",{aString:aString,anElement:anElement}, smalltalk.HTMLSnippet)})},
 args: ["aString", "anElement"],
-source: "snippetAt: aString put: anElement\x0a\x09self snippets at: aString put: anElement",
-messageSends: ["at:put:", "snippets"],
+source: "snippetAt: aString install: anElement\x0a\x09self snippets at: aString put: anElement.\x0a    self snippetAt: aString compile: anElement",
+messageSends: ["at:put:", "snippets", "snippetAt:compile:"],
 referencedClasses: []
 }),
 smalltalk.HTMLSnippet);

st/Canvas.st

@@ -552,14 +552,6 @@ snippetAt: aString
 	^ self snippets at: aString
 !
 
-snippetAt: aString ifAbsent: aBlock
-	^ self snippets at: aString ifAbsent: aBlock
-!
-
-snippetAt: aString put: anElement
-	self snippets at: aString put: anElement
-!
-
 snippets
 	^snippets ifNil: [ snippets := #{} ]
 ! !
@@ -609,9 +601,8 @@ installSnippetFromJQuery: element
 !
 
 snippetAt: aString install: anElement
-	self 
-    	snippetAt: aString put: anElement;
-        snippetAt: aString compile: anElement
+	self snippets at: aString put: anElement.
+    self snippetAt: aString compile: anElement
 ! !
 
 HTMLSnippet class instanceVariableNames: 'current'!