Changeset 1472563

Timestamp:

08/11/2016 07:51:32 PM (9 years ago)

Author:

gasparfm

Message:

version 0.2.4

Location:

simterm/trunk

Files:

• CHANGELOG (modified) (1 diff)
• js/show-your-terms.js (modified) (4 diffs)
• js/show-your-terms.min.js (modified) (1 diff)
• readme.txt (modified) (2 diffs)
• simterm-core.php (modified) (2 diffs)
• simterm-settings.php (modified) (1 diff)
• simterm.php (modified) (1 diff)

simterm/trunk/CHANGELOG

@@ +1 @@
+20160811    Gaspar Fernández <[email protected]>
+    * Main JS update, now supports pause on lines
+    * Ability to change theme in the shortcut [simterm theme="dark"]...[/simterm]
+    * Version tagged 0.2.4
+
 20160804    Gaspar Fernández <[email protected]>
     * < and > are now visible, not stripped.

simterm/trunk/js/show-your-terms.js

@@ -65 +65 @@
     };
 
-    ShowYourTerms.prototype.addCommand = function(content, options) {
-      return this.content[0].push(["command", content, options]);
+    ShowYourTerms.prototype.addCommand = function(content, options, outputTerm) {
+      if (outputTerm == null) {
+        outputTerm = 0;
+      }
+      if (outputTerm < this.content.length) {
+        return this.content[outputTerm].push(["command", content, options]);
+      }
     };
 
-    ShowYourTerms.prototype.addLine = function(content, options) {
-      return this.content[0].push(["line", content, options]);
+    ShowYourTerms.prototype.addLine = function(content, options, outputTerm) {
+      if (outputTerm == null) {
+        outputTerm = 0;
+      }
+      if (outputTerm < this.content.length) {
+        return this.content[outputTerm].push(["line", content, options]);
+      }
     };
 
@@ -123 +133 @@
 
     ShowYourTerms.prototype.outputGenerator = function(output, outputTerm) {
-      var content, counter, currentLine, interval, options, speed, type;
+      var content, counter, currentLine, interval, options, pauseInterval, speed, type;
       type = output[0], content = output[1], options = output[2];
       currentLine = document.createElement("div");
@@ -136 +146 @@
       currentLine.classList.add('active');
       if (type === "command") {
+        if (!currentLine.classList.contains('type')) {
+          currentLine.classList.add('command');
+        }
         counter = 0;
         return interval = setInterval(((function(_this) {
@@ -152 +165 @@
         })(this)), speed);
       } else {
-        currentLine.appendChild(document.createTextNode(content));
-        this.container[outputTerm].appendChild(currentLine);
-        currentLine.classList.remove('active');
-        return this.callNextOutput(options.delay, outputTerm);
+        if (!this.isPlaying(outputTerm)) {
+          return pauseInterval = setInterval(((function(_this) {
+            return function() {
+              if (_this.isPlaying(outputTerm)) {
+                clearInterval(pauseInterval);
+                return _this.callNextOutput(options.delay, outputTerm);
+              }
+            };
+          })(this)), speed);
+        } else {
+          currentLine.appendChild(document.createTextNode(content));
+          this.container[outputTerm].appendChild(currentLine);
+          currentLine.classList.remove('active');
+          return this.callNextOutput(options.delay, outputTerm);
+        }
       }
     };

simterm/trunk/js/show-your-terms.min.js

@@ -1 @@
-/*! show-your-terms - Kande Bonfim <[email protected]> - 2016-07-27 */
-(function(){this.ShowYourTerms=function(){function a(a,b,c){var d,e,f,g,h,i,j;this.container=a,this.replay=null!=b?b:!0,this.termsOptions=null!=c?c:{},d={single:!1,pauseOnClick:!0};for(g in d)j=d[g],g in this.termsOptions||(this.termsOptions[g]=j);if(this.container.nodeType||(this.container=document.querySelectorAll(this.container)),this.content=[],this.sstatus=[],this.outputIndex=[],this.container.length>0)for(i=this.container.length-1,this.termsOptions.single&&(i=0),e=f=0,h=i;h>=0?h>=f:f>=h;e=h>=0?++f:--f)this.content[e]=[],this.sstatus[e]="ready",this.defineEvents(e),this.container[e].innerText.length>0&&this.declarativeBuilder(e)}return a.prototype.declarativeBuilder=function(a){var b,c,d,e;for(e=this.container[a].children,c=0,d=e.length;d>c;c++)b=e[c],this.content[a].push([b.getAttribute("data-action"),b.innerText,{styles:b.classList,delay:b.getAttribute("data-delay"),speed:b.getAttribute("data-speed")}]);return this.container[a].style.minHeight=window.getComputedStyle(this.container[a],null).getPropertyValue("height"),this.play(a)},a.prototype.defineEvents=function(a){return this.termsOptions.pauseOnClick?this.container[a].addEventListener("click",function(b){return function(){return b.togglePause(a)}}(this)):void 0},a.prototype.addCommand=function(a,b){return this.content[0].push(["command",a,b])},a.prototype.addLine=function(a,b){return this.content[0].push(["line",a,b])},a.prototype.play=function(a){return null==a&&(a=0),"ready"===this.sstatus[a]?(this.sstatus[a]="playing",this.container[a].innerHTML="",this.outputIndex[a]=0,this.outputGenerator(this.content[a][this.outputIndex[a]],a)):void 0},a.prototype.playagain=function(a){return null==a&&(a=0),this.sstatus[a]="ready",this.play(a)},a.prototype.callNextOutput=function(a,b){return this.outputIndex[b]+=1,this.content[b][this.outputIndex[b]]?setTimeout(function(a){return function(){return a.outputGenerator(a.content[b][a.outputIndex[b]],b)}}(this),a):this.replay?setTimeout(function(a){return function(){return a.playagain(b)}}(this),a):void 0},a.prototype.isPlaying=function(a){return"playing"===this.sstatus[a]},a.prototype.togglePause=function(a){return"playing"===this.sstatus[a]?this.sstatus[a]="pause":"pause"===this.sstatus[a]?this.sstatus[a]="playing":void 0},a.prototype.outputGenerator=function(a,b){var c,d,e,f,g,h,i;return i=a[0],c=a[1],g=a[2],e=document.createElement("div"),g.styles&&e.setAttribute("class",g.styles),h=g.speed?g.speed:100,e.classList.add("active"),"command"===i?(d=0,f=setInterval(function(a){return function(){return a.isPlaying(b)&&(e.appendChild(document.createTextNode(c[d])),a.container[b].appendChild(e),d++,d===c.length)?(e.classList.remove("active"),a.callNextOutput(g.delay,b),clearInterval(f)):void 0}}(this),h)):(e.appendChild(document.createTextNode(c)),this.container[b].appendChild(e),e.classList.remove("active"),this.callNextOutput(g.delay,b))},a}()}).call(this);
+/*! show-your-terms - Kande Bonfim <[email protected]> - 2016-08-11 */
+(function(){this.ShowYourTerms=function(){function a(a,b,c){var d,e,f,g,h,i,j;this.container=a,this.replay=null!=b?b:!0,this.termsOptions=null!=c?c:{},d={single:!1,pauseOnClick:!0};for(g in d)j=d[g],g in this.termsOptions||(this.termsOptions[g]=j);if(this.container.nodeType||(this.container=document.querySelectorAll(this.container)),this.content=[],this.sstatus=[],this.outputIndex=[],this.container.length>0)for(i=this.container.length-1,this.termsOptions.single&&(i=0),e=f=0,h=i;h>=0?h>=f:f>=h;e=h>=0?++f:--f)this.content[e]=[],this.sstatus[e]="ready",this.defineEvents(e),this.container[e].innerText.length>0&&this.declarativeBuilder(e)}return a.prototype.declarativeBuilder=function(a){var b,c,d,e;for(e=this.container[a].children,c=0,d=e.length;d>c;c++)b=e[c],this.content[a].push([b.getAttribute("data-action"),b.innerText,{styles:b.classList,delay:b.getAttribute("data-delay"),speed:b.getAttribute("data-speed")}]);return this.container[a].style.minHeight=window.getComputedStyle(this.container[a],null).getPropertyValue("height"),this.play(a)},a.prototype.defineEvents=function(a){return this.termsOptions.pauseOnClick?this.container[a].addEventListener("click",function(b){return function(){return b.togglePause(a)}}(this)):void 0},a.prototype.addCommand=function(a,b,c){return null==c&&(c=0),c<this.content.length?this.content[c].push(["command",a,b]):void 0},a.prototype.addLine=function(a,b,c){return null==c&&(c=0),c<this.content.length?this.content[c].push(["line",a,b]):void 0},a.prototype.play=function(a){return null==a&&(a=0),"ready"===this.sstatus[a]?(this.sstatus[a]="playing",this.container[a].innerHTML="",this.outputIndex[a]=0,this.outputGenerator(this.content[a][this.outputIndex[a]],a)):void 0},a.prototype.playagain=function(a){return null==a&&(a=0),this.sstatus[a]="ready",this.play(a)},a.prototype.callNextOutput=function(a,b){return this.outputIndex[b]+=1,this.content[b][this.outputIndex[b]]?setTimeout(function(a){return function(){return a.outputGenerator(a.content[b][a.outputIndex[b]],b)}}(this),a):this.replay?setTimeout(function(a){return function(){return a.playagain(b)}}(this),a):void 0},a.prototype.isPlaying=function(a){return"playing"===this.sstatus[a]},a.prototype.togglePause=function(a){return"playing"===this.sstatus[a]?this.sstatus[a]="pause":"pause"===this.sstatus[a]?this.sstatus[a]="playing":void 0},a.prototype.outputGenerator=function(a,b){var c,d,e,f,g,h,i,j;return j=a[0],c=a[1],g=a[2],e=document.createElement("div"),g.styles&&e.setAttribute("class",g.styles),i=g.speed?g.speed:100,e.classList.add("active"),"command"===j?(e.classList.contains("type")||e.classList.add("command"),d=0,f=setInterval(function(a){return function(){return a.isPlaying(b)&&(e.appendChild(document.createTextNode(c[d])),a.container[b].appendChild(e),d++,d===c.length)?(e.classList.remove("active"),a.callNextOutput(g.delay,b),clearInterval(f)):void 0}}(this),i)):this.isPlaying(b)?(e.appendChild(document.createTextNode(c)),this.container[b].appendChild(e),e.classList.remove("active"),this.callNextOutput(g.delay,b)):h=setInterval(function(a){return function(){return a.isPlaying(b)?(clearInterval(h),a.callNextOutput(g.delay,b)):void 0}}(this),i)},a}()}).call(this);

simterm/trunk/readme.txt

@@ -5 +5 @@
 Requires at least: 4.2
 Tested up to: 4.5
-Stable tag: 0.2.3
+Stable tag: 0.2.4
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -44 +44 @@
 == Changelog ==
 
+= 0.2.4 (2016-08-11) =
+* Main JS update, now supports pause on lines
+* Ability to change theme in the shortcut [simterm theme="dark"]...[/simterm]
+
 = 0.2.3 (2016-08-04) =
 * < and > are now visible.

simterm/trunk/simterm-core.php

@@ -42 +42 @@
       if (get_option('simterm-transform-chars'))
     $filters[] = array($this, 'fixDashes');
-      $data['theme'] = $defaultTheme;
+      $data['theme'] = ( (isset($atts['theme'])) && ($this->settings()->validTheme($atts['theme'])) )?$atts['theme']:$defaultTheme;
       $data['title'] = (isset($atts['title']))?$atts['title']:get_option('simterm-window-title');
 
@@ -83 +83 @@
       return $content; 
     }
+
 };

simterm/trunk/simterm-settings.php

@@ -223 +223 @@
     }
 
+    function validTheme($theme)
+    {
+    static $validThemes = array('regular', 'light', 'dark', 'blue');
+    return (in_array($theme, $validThemes));
+    }
+
 };

simterm/trunk/simterm.php

@@ -4 +4 @@
  * Plugin URI:  http://gaspar.totaki.com/en/php-project/simterm/
  * Description: Simulates terminal input/output for tutorials
- * Version: 0.2.3
+ * Version: 0.2.4
  * Author: Gaspar Fernández
  * Author URI: http://totaki.com/poesiabinaria/