|
@@ -1673,7 +1673,11 @@ $ctx1.sendIdx["class:"]=1;
|
|
$2=_st($1)._with_((function(){
|
|
$2=_st($1)._with_((function(){
|
|
return smalltalk.withContext(function($ctx2) {
|
|
return smalltalk.withContext(function($ctx2) {
|
|
$3=_st(html)._strong();
|
|
$3=_st(html)._strong();
|
|
|
|
+<<<<<<< Updated upstream
|
|
_st($3)._class_("pull-right");
|
|
_st($3)._class_("pull-right");
|
|
|
|
+=======
|
|
|
|
+_st($3)._class_("label");
|
|
|
|
+>>>>>>> Stashed changes
|
|
$ctx2.sendIdx["class:"]=2;
|
|
$ctx2.sendIdx["class:"]=2;
|
|
$4=_st($3)._with_(_st(_st(aBinding)._shortcut())._asLowercase());
|
|
$4=_st($3)._with_(_st(_st(aBinding)._shortcut())._asLowercase());
|
|
$ctx2.sendIdx["with:"]=2;
|
|
$ctx2.sendIdx["with:"]=2;
|
|
@@ -1690,7 +1694,11 @@ return $6;
|
|
$ctx1.sendIdx["with:"]=1;
|
|
$ctx1.sendIdx["with:"]=1;
|
|
return self}, function($ctx1) {$ctx1.fill(self,"renderBindingActionFor:on:",{aBinding:aBinding,html:html},globals.HLKeyBinderHelperWidget)})},
|
|
return self}, function($ctx1) {$ctx1.fill(self,"renderBindingActionFor:on:",{aBinding:aBinding,html:html},globals.HLKeyBinderHelperWidget)})},
|
|
args: ["aBinding", "html"],
|
|
args: ["aBinding", "html"],
|
|
|
|
+<<<<<<< Updated upstream
|
|
source: "renderBindingActionFor: aBinding on: html\x0a\x09html span class: 'command'; with: [\x0a\x09\x09html strong \x0a\x09\x09\x09class: 'pull-right'; \x0a\x09\x09\x09with: aBinding shortcut asLowercase.\x0a \x09\x09html a \x0a \x09class: 'action'; \x0a with: aBinding displayLabel;\x0a \x09\x09\x09onClick: [ self keyBinder applyBinding: aBinding ] ]",
|
|
source: "renderBindingActionFor: aBinding on: html\x0a\x09html span class: 'command'; with: [\x0a\x09\x09html strong \x0a\x09\x09\x09class: 'pull-right'; \x0a\x09\x09\x09with: aBinding shortcut asLowercase.\x0a \x09\x09html a \x0a \x09class: 'action'; \x0a with: aBinding displayLabel;\x0a \x09\x09\x09onClick: [ self keyBinder applyBinding: aBinding ] ]",
|
|
|
|
+=======
|
|
|
|
+source: "renderBindingActionFor: aBinding on: html\x0a\x09html span class: 'command'; with: [\x0a\x09\x09html strong \x0a\x09\x09\x09class: 'label'; \x0a\x09\x09\x09with: aBinding shortcut asLowercase.\x0a \x09\x09html a \x0a \x09class: 'action'; \x0a with: aBinding displayLabel;\x0a \x09\x09\x09onClick: [ self keyBinder applyBinding: aBinding ] ]",
|
|
|
|
+>>>>>>> Stashed changes
|
|
messageSends: ["class:", "span", "with:", "strong", "asLowercase", "shortcut", "a", "displayLabel", "onClick:", "applyBinding:", "keyBinder"],
|
|
messageSends: ["class:", "span", "with:", "strong", "asLowercase", "shortcut", "a", "displayLabel", "onClick:", "applyBinding:", "keyBinder"],
|
|
referencedClasses: []
|
|
referencedClasses: []
|
|
}),
|
|
}),
|
|
@@ -1796,6 +1804,8 @@ $1=_st(html)._div();
|
|
$ctx1.sendIdx["div"]=1;
|
|
$ctx1.sendIdx["div"]=1;
|
|
_st($1)._id_("overlay");
|
|
_st($1)._id_("overlay");
|
|
$ctx1.sendIdx["id:"]=1;
|
|
$ctx1.sendIdx["id:"]=1;
|
|
|
|
+_st($1)._class_("light");
|
|
|
|
+$ctx1.sendIdx["class:"]=1;
|
|
$2=_st($1)._onClick_((function(){
|
|
$2=_st($1)._onClick_((function(){
|
|
return smalltalk.withContext(function($ctx2) {
|
|
return smalltalk.withContext(function($ctx2) {
|
|
return self._deactivate();
|
|
return self._deactivate();
|
|
@@ -1819,8 +1829,8 @@ $ctx1.sendIdx["with:"]=1;
|
|
_st(":focus"._asJQuery())._blur();
|
|
_st(":focus"._asJQuery())._blur();
|
|
return self}, function($ctx1) {$ctx1.fill(self,"renderContentOn:",{html:html},globals.HLKeyBinderHelperWidget)})},
|
|
return self}, function($ctx1) {$ctx1.fill(self,"renderContentOn:",{html:html},globals.HLKeyBinderHelperWidget)})},
|
|
args: ["html"],
|
|
args: ["html"],
|
|
-source: "renderContentOn: html\x0a\x09html div \x0a\x09\x09id: 'overlay';\x0a\x09\x09onClick: [ self deactivate ].\x0a\x09\x0a\x09html div class: self cssClass; with: [\x0a \x09self renderLabelOn: html.\x0a\x09\x09html div\x0a\x09\x09\x09id: self mainId;\x0a\x09\x09\x09with: [ self renderSelectedBindingOn: html ].\x0a\x09\x09self renderCloseOn: html ].\x0a\x09\x09\x0a\x09':focus' asJQuery blur",
|
|
|
|
-messageSends: ["id:", "div", "onClick:", "deactivate", "class:", "cssClass", "with:", "renderLabelOn:", "mainId", "renderSelectedBindingOn:", "renderCloseOn:", "blur", "asJQuery"],
|
|
|
|
|
|
+source: "renderContentOn: html\x0a\x09html div \x0a\x09\x09id: 'overlay';\x0a\x09\x09class: 'light';\x0a\x09\x09onClick: [ self deactivate ].\x0a\x09\x0a\x09html div class: self cssClass; with: [\x0a \x09self renderLabelOn: html.\x0a\x09\x09html div\x0a\x09\x09\x09id: self mainId;\x0a\x09\x09\x09with: [ self renderSelectedBindingOn: html ].\x0a\x09\x09self renderCloseOn: html ].\x0a\x09\x09\x0a\x09':focus' asJQuery blur",
|
|
|
|
+messageSends: ["id:", "div", "class:", "onClick:", "deactivate", "cssClass", "with:", "renderLabelOn:", "mainId", "renderSelectedBindingOn:", "renderCloseOn:", "blur", "asJQuery"],
|
|
referencedClasses: []
|
|
referencedClasses: []
|
|
}),
|
|
}),
|
|
globals.HLKeyBinderHelperWidget);
|
|
globals.HLKeyBinderHelperWidget);
|