From 5a47170f7f8abb00e39e2bc033a153ec85ab6010 Mon Sep 17 00:00:00 2001 From: "Aaron C. Meadows" Date: Sun, 3 May 2015 10:30:07 -0500 Subject: [PATCH] Squashed 'Torch/' changes from fa46e0f..ad61293 ad61293 prod-Torch: Updated prod version of Torch at version 0.8.2. git-subtree-dir: Torch git-subtree-split: ad61293cae8125db50229fced38f03d9b150d6d5 --- Torch.js | 12 ++++++------ package.json | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Torch.js b/Torch.js index ac9f1836d6..150f455e5d 100644 --- a/Torch.js +++ b/Torch.js @@ -5,8 +5,8 @@ var Torch = Torch || (function() { 'use strict'; - var version = '0.8.1', - lastUpdate = 1430601526, + var version = '0.8.2', + lastUpdate = 1430666803, schemaVersion = 0.1, flickerURL = 'https://s3.amazonaws.com/files.d20.io/images/4277467/iQYjFOsYC5JsuOPUCI9RGA/thumb.png?1401938659', flickerPeriod = 400, @@ -234,9 +234,9 @@ var Torch = Torch || (function() { .rest(4) .uniq() .filter(function(a){ - var angle=a.match(/^--(\d+)$/)[1]; + var angle=a.match(/^--(\d+)$/); if(angle){ - arc_angle=(Math.min(360,Math.max(0,angle))); + arc_angle=(Math.min(360,Math.max(0,angle[1]))); return false; } return true; @@ -356,9 +356,9 @@ var Torch = Torch || (function() { .rest(4) .uniq() .filter(function(a){ - var angle=a.match(/^--(\d+)$/)[1]; + var angle=a.match(/^--(\d+)$/); if(angle){ - arc_angle=(Math.min(360,Math.max(0,angle))); + arc_angle=(Math.min(360,Math.max(0,angle[1]))); return false; } return true; diff --git a/package.json b/package.json index f90a115bcc..677df8e5ee 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "Torch", - "version": "0.8.1", + "version": "0.8.2", "description": "A simple script for giving lights to tokens and turning off and on dynamic lighting.", "authors": "The Aaron", "roll20userid": "104025",