Browse Source

Small changes.

Herby Vojčík 5 years ago
parent
commit
2d1a23b89b
2 changed files with 23 additions and 34 deletions
  1. 22 32
      src/Helios-Core.js
  2. 1 2
      src/Helios-Core.st

+ 22 - 32
src/Helios-Core.js

@@ -8411,25 +8411,26 @@ var self=this,$self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $4,$3,$2,$1,$7,$6,$5;
-$4=$self._collection();
+var $5,$4,$3,$2,$1,$8,$7,$6;
+$5=$self._collection();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["collection"]=1;
 //>>excludeEnd("ctx");
-$3=$recv($4)._size();
+$4=$recv($5)._size();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["size"]=1;
 //>>excludeEnd("ctx");
-$2=$recv(anInteger).__slash($3);
-$1=$recv($2).__star((100));
+$3=$recv(anInteger).__slash($4);
+$2=$recv($3).__star((100));
+$1=$recv($2)._rounded();
 $self._updateProgress_($1);
-$7=$self._collection();
+$8=$self._collection();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["collection"]=2;
 //>>excludeEnd("ctx");
-$6=$recv($7)._size();
-$5=$recv(anInteger).__lt_eq($6);
-if($core.assert($5)){
+$7=$recv($8)._size();
+$6=$recv(anInteger).__lt_eq($7);
+if($core.assert($6)){
 $recv((function(){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
@@ -8458,11 +8459,11 @@ return self;
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
 args: ["anInteger"],
-source: "evaluateAt: anInteger\x0a\x09self updateProgress: (anInteger / self collection size) * 100.\x0a\x09anInteger <= self collection size\x0a\x09\x09ifTrue: [ \x0a\x09\x09\x09[ \x0a\x09\x09\x09\x09self workBlock value: (self collection at: anInteger).\x0a\x09\x09\x09\x09self evaluateAt: anInteger + 1 ] fork ]\x0a\x09\x09ifFalse: [ [ self remove ] valueWithTimeout: 500 ]",
+source: "evaluateAt: anInteger\x0a\x09self updateProgress: ((anInteger / self collection size) * 100) rounded.\x0a\x09anInteger <= self collection size\x0a\x09\x09ifTrue: [ \x0a\x09\x09\x09[ \x0a\x09\x09\x09\x09self workBlock value: (self collection at: anInteger).\x0a\x09\x09\x09\x09self evaluateAt: anInteger + 1 ] fork ]\x0a\x09\x09ifFalse: [ [ self remove ] valueWithTimeout: 500 ]",
 referencedClasses: [],
 //>>excludeEnd("ide");
 pragmas: [],
-messageSends: ["updateProgress:", "*", "/", "size", "collection", "ifTrue:ifFalse:", "<=", "fork", "value:", "workBlock", "at:", "evaluateAt:", "+", "valueWithTimeout:", "remove"]
+messageSends: ["updateProgress:", "rounded", "*", "/", "size", "collection", "ifTrue:ifFalse:", "<=", "fork", "value:", "workBlock", "at:", "evaluateAt:", "+", "valueWithTimeout:", "remove"]
 }),
 $globals.HLProgressBarWidget);
 
@@ -8578,37 +8579,26 @@ var self=this,$self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2,$3,$4,$5;
-$1=$recv(html)._span();
-$2=$self._label();
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-$ctx1.sendIdx["label"]=1;
-//>>excludeEnd("ctx");
-$recv($1)._with_($2);
+var $1,$2;
+$recv($recv(html)._span())._with_($self._label());
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["with:"]=1;
 //>>excludeEnd("ctx");
-$3=console;
-$recv($3)._log_("progress bar: ");
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-$ctx1.sendIdx["log:"]=1;
-//>>excludeEnd("ctx");
-$recv($3)._log_($self._label());
-$4=$recv(html)._div();
+$1=$recv(html)._div();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["div"]=1;
 //>>excludeEnd("ctx");
-$recv($4)._class_("progress");
+$recv($1)._class_("progress");
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["class:"]=1;
 //>>excludeEnd("ctx");
-$recv($4)._with_((function(){
+$recv($1)._with_((function(){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
-$5=$recv(html)._div();
-$recv($5)._class_("progress-bar");
-$self.bar=$recv($5)._style_("width: 0%");
+$2=$recv(html)._div();
+$recv($2)._class_("progress-bar");
+$self.bar=$recv($2)._style_("width: 0%");
 return $self.bar;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)});
@@ -8621,11 +8611,11 @@ return self;
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
 args: ["html"],
-source: "renderContentOn: html\x0a\x09html span with: self label.\x0a\x09console log: 'progress bar: '; log: self label.\x0a\x09html div \x0a\x09\x09class: 'progress';\x0a\x09\x09with: [\x0a\x09\x09\x09bar := html div \x0a\x09\x09\x09\x09class: 'progress-bar';\x0a\x09\x09\x09\x09style: 'width: 0%' ]",
+source: "renderContentOn: html\x0a\x09html span with: self label.\x0a\x09html div \x0a\x09\x09class: 'progress';\x0a\x09\x09with: [\x0a\x09\x09\x09bar := html div \x0a\x09\x09\x09\x09class: 'progress-bar';\x0a\x09\x09\x09\x09style: 'width: 0%' ]",
 referencedClasses: [],
 //>>excludeEnd("ide");
 pragmas: [],
-messageSends: ["with:", "span", "label", "log:", "class:", "div", "style:"]
+messageSends: ["with:", "span", "label", "class:", "div", "style:"]
 }),
 $globals.HLProgressBarWidget);
 

+ 1 - 2
src/Helios-Core.st

@@ -1944,7 +1944,7 @@ workBlock: aBlock
 !HLProgressBarWidget methodsFor: 'actions'!
 
 evaluateAt: anInteger
-	self updateProgress: (anInteger / self collection size) * 100.
+	self updateProgress: ((anInteger / self collection size) * 100) rounded.
 	anInteger <= self collection size
 		ifTrue: [ 
 			[ 
@@ -1971,7 +1971,6 @@ updateProgress: anInteger
 
 renderContentOn: html
 	html span with: self label.
-	console log: 'progress bar: '; log: self label.
 	html div 
 		class: 'progress';
 		with: [