typedjs-rails 1.0.2 → 1.0.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 1d3a0d8f97114c6c9153690899a4371ba603048d
+  data.tar.gz: 5468528a770860eaee5608a9623f1b0f6e533882
+SHA512:
+  metadata.gz: 085186bd07a291006b365b14746f7fe55ca5854ab9daabf52ef5d3e8e66039845d18d7f3ee63eecd70cf9267da1f0a8dd26c31e38db3a0e3d69f08d3dff334a1
+  data.tar.gz: 33bf3971a5602de5bffd5611d117fc1a4f71559fff64ccbee3b0b98af4e8d0b681be2509e490000e4c5e272bbba3360cf221c0133ae24a88347012bb586423ac

data/README.md

@@ -1,11 +1,13 @@
 # typedjs-rails
 This gem just includes [Typed.js](https://github.com/mattboldt/typed.js) as an asset in the Rails 3.1 (or newer) asset pipeline.
 
+The current version in the gem is Typed.js 1.1.1
+
 ## Installation
 
 Add the gem to the Gemfile
 
-    gem "typedjs-rails", "~> 1.0.1"
+    gem "typedjs-rails", "~> 1.0.3"
 
 ## Usage
 

data/app/assets/javascripts/typed.js

@@ -60,6 +60,9 @@
         // amount of time to wait before backspacing
         this.backDelay = this.options.backDelay;
 
+        // div containing strings
+        this.stringsElement = this.options.stringsElement;
+
         // input strings of text
         this.strings = this.options.strings;
 
@@ -85,6 +88,11 @@
         // custom cursor
         this.cursorChar = this.options.cursorChar;
 
+        // shuffle the strings
+        this.shuffle = this.options.shuffle;
+        // the order of strings
+        this.sequence = [];
+
         // All systems go!
         this.build();
     };
@@ -95,22 +103,36 @@
 
         ,
         init: function() {
-            // begin the loop w/ first current string (global self.string)
+            // begin the loop w/ first current string (global self.strings)
             // current string will be passed as an argument each time after this
             var self = this;
             self.timeout = setTimeout(function() {
+                for (var i=0;i<self.strings.length;++i) self.sequence[i]=i;
+
+                // shuffle the array if true
+                if(self.shuffle) self.sequence = self.shuffleArray(self.sequence);
+
                 // Start typing
-                self.typewrite(self.strings[self.arrayPos], self.strPos);
+                self.typewrite(self.strings[self.sequence[self.arrayPos]], self.strPos);
             }, self.startDelay);
         }
 
         ,
         build: function() {
+            var self = this;
             // Insert cursor
             if (this.showCursor === true) {
                 this.cursor = $("<span class=\"typed-cursor\">" + this.cursorChar + "</span>");
                 this.el.after(this.cursor);
             }
+            if (this.stringsElement) {
+                self.strings = [];
+                this.stringsElement.hide();
+                var strings = this.stringsElement.find('p');
+                $.each(strings, function(key, value){
+                    self.strings.push($(value).html());
+                });
+            }
             this.init();
         }
 
@@ -156,14 +178,21 @@
 
                 if (self.contentType === 'html') {
                     // skip over html tags while typing
-                    if (curString.substr(curStrPos).charAt(0) === '<') {
+                    var curChar = curString.substr(curStrPos).charAt(0)
+                    if (curChar === '<' || curChar === '&') {
                         var tag = '';
-                        while (curString.substr(curStrPos).charAt(0) !== '>') {
+                        var endTag = '';
+                        if (curChar === '<') {
+                            endTag = '>'
+                        } else {
+                            endTag = ';'
+                        }
+                        while (curString.substr(curStrPos).charAt(0) !== endTag) {
                             tag += curString.substr(curStrPos).charAt(0);
                             curStrPos++;
                         }
                         curStrPos++;
-                        tag += '>';
+                        tag += endTag;
                     }
                 }
 
@@ -196,11 +225,13 @@
 
                         // start typing each new char into existing string
                         // curString: arg, self.el.html: original text inside element
-                        var nextString = self.elContent + curString.substr(0, curStrPos + 1);
+                        var nextString = curString.substr(0, curStrPos + 1);
                         if (self.attr) {
                             self.el.attr(self.attr, nextString);
                         } else {
-                            if (self.contentType === 'html') {
+                            if (self.isInput) {
+                                self.el.val(nextString);
+                            } else if (self.contentType === 'html') {
                                 self.el.html(nextString);
                             } else {
                                 self.el.text(nextString);
@@ -262,11 +293,13 @@
 
                 // ----- continue important stuff ----- //
                 // replace text with base text + typed characters
-                var nextString = self.elContent + curString.substr(0, curStrPos);
+                var nextString = curString.substr(0, curStrPos);
                 if (self.attr) {
                     self.el.attr(self.attr, nextString);
                 } else {
-                    if (self.contentType === 'html') {
+                    if (self.isInput) {
+                        self.el.val(nextString);
+                    } else if (self.contentType === 'html') {
                         self.el.html(nextString);
                     } else {
                         self.el.text(nextString);
@@ -288,15 +321,34 @@
 
                     if (self.arrayPos === self.strings.length) {
                         self.arrayPos = 0;
+
+                        // Shuffle sequence again
+                        if(self.shuffle) self.sequence = self.shuffleArray(self.sequence);
+
                         self.init();
                     } else
-                        self.typewrite(self.strings[self.arrayPos], curStrPos);
+                        self.typewrite(self.strings[self.sequence[self.arrayPos]], curStrPos);
                 }
 
                 // humanized value for typing
             }, humanize);
 
         }
+        /**
+         * Shuffles the numbers in the given array.
+         * @param {Array} array
+         * @returns {Array}
+         */
+        ,shuffleArray: function(array) {
+            var tmp, current, top = array.length;
+            if(top) while(--top) {
+                current = Math.floor(Math.random() * (top + 1));
+                tmp = array[current];
+                array[current] = array[top];
+                array[top] = tmp;
+            }
+            return array;
+        }
 
         // Start & Stop currently not working
 
@@ -324,7 +376,9 @@
             var id = this.el.attr('id');
             this.el.after('<span id="' + id + '"/>')
             this.el.remove();
-            this.cursor.remove();
+            if (typeof this.cursor !== 'undefined') {
+                this.cursor.remove();
+            }
             // Send the callback
             self.options.resetCallback();
         }
@@ -343,12 +397,15 @@
 
     $.fn.typed.defaults = {
         strings: ["These are the default values...", "You know what you should do?", "Use your own!", "Have a great day!"],
+        stringsElement: null,
         // typing speed
         typeSpeed: 0,
         // time before typing starts
         startDelay: 0,
         // backspacing speed
         backSpeed: 0,
+        // shuffle the strings
+        shuffle: false,
         // time before backspacing
         backDelay: 500,
         // loop

data/lib/typedjs/version.rb

@@ -1,3 +1,3 @@
 module Typedjs
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

data/typedjs-rails.gemspec

@@ -4,7 +4,7 @@ require "typedjs/version"
 
 Gem::Specification.new do |s|
   s.name        = "typedjs-rails"
-  s.version     = "1.0.2"
+  s.version     = "1.0.3"
   s.authors     = ["TheDartCode"]
   s.email       = ["giorgos@thedartcode.com"]
   s.homepage    = "http://www.thedartcode.com/"

metadata

@@ -1,77 +1,65 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: typedjs-rails
-version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: 
-  segments: 
-  - 1
-  - 0
-  - 2
-  version: 1.0.2
+version: !ruby/object:Gem::Version
+  version: 1.0.3
 platform: ruby
-authors: 
+authors:
 - TheDartCode
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2015-01-20 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2016-01-28 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: railties
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 3
-        - 1
-        version: "3.1"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '3.1'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rails
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 3
-        - 1
-        version: "3.1"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '3.1'
   type: :development
-  version_requirements: *id003
-description: Gem that includes Typed.js, in the Rails Asset Pipeline introduced in Rails 3.1
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '3.1'
+description: Gem that includes Typed.js, in the Rails Asset Pipeline introduced in
+  Rails 3.1
+email:
 - giorgos@thedartcode.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - README.md
@@ -82,36 +70,25 @@ files:
 - typedjs-rails.gemspec
 homepage: http://www.thedartcode.com/
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 2.4.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Gem for easily adding Typed.js to the Rails Asset Pipeline
 test_files: []
-