Skip to content

Commit 667cfc3

Browse files
author
Michael Bleigh
committed
Fix sketch() commands.
1 parent 7d9da07 commit 667cfc3

File tree

3 files changed

+19
-15
lines changed

3 files changed

+19
-15
lines changed

docs/sketch.html

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,12 @@
1313
a string argument followed by a value, it will set an instance variable
1414
(e.g. <code>.sketch('color','#f00')</code>.</p> </td> <td class="code"> <div class="highlight"><pre> <span class="k">if</span> <span class="k">typeof</span><span class="p">(</span><span class="nx">key</span><span class="p">)</span> <span class="o">==</span> <span class="s1">&#39;string&#39;</span> <span class="o">&amp;&amp;</span> <span class="nx">sketch</span>
1515
<span class="k">if</span> <span class="nx">sketch</span><span class="p">[</span><span class="nx">key</span><span class="p">]</span>
16-
<span class="nx">sketch</span><span class="p">[</span><span class="nx">key</span><span class="p">].</span><span class="nx">apply</span> <span class="nx">sketch</span><span class="p">,</span> <span class="nx">args</span>
17-
<span class="k">else</span> <span class="k">if</span> <span class="nx">args</span><span class="p">.</span><span class="nx">length</span> <span class="o">==</span> <span class="mi">1</span>
18-
<span class="nx">sketch</span><span class="p">.</span><span class="nx">set</span> <span class="nx">key</span><span class="p">,</span> <span class="nx">args</span><span class="p">[</span><span class="mi">0</span><span class="p">]</span>
19-
<span class="k">else</span> <span class="k">if</span> <span class="nx">args</span><span class="p">.</span><span class="nx">length</span> <span class="o">==</span> <span class="mi">0</span>
20-
<span class="nx">sketch</span><span class="p">[</span><span class="nx">key</span><span class="p">]</span>
16+
<span class="k">if</span> <span class="k">typeof</span><span class="p">(</span><span class="nx">sketch</span><span class="p">[</span><span class="nx">key</span><span class="p">])</span> <span class="o">==</span> <span class="s1">&#39;function&#39;</span>
17+
<span class="nx">sketch</span><span class="p">[</span><span class="nx">key</span><span class="p">].</span><span class="nx">apply</span> <span class="nx">sketch</span><span class="p">,</span> <span class="nx">args</span>
18+
<span class="k">else</span> <span class="k">if</span> <span class="nx">args</span><span class="p">.</span><span class="nx">length</span> <span class="o">==</span> <span class="mi">0</span>
19+
<span class="nx">sketch</span><span class="p">[</span><span class="nx">key</span><span class="p">]</span>
20+
<span class="k">else</span> <span class="k">if</span> <span class="nx">args</span><span class="p">.</span><span class="nx">length</span> <span class="o">==</span> <span class="mi">1</span>
21+
<span class="nx">sketch</span><span class="p">[</span><span class="nx">key</span><span class="p">]</span> <span class="o">=</span> <span class="nx">args</span><span class="p">[</span><span class="mi">0</span><span class="p">]</span>
2122
<span class="k">else</span>
2223
<span class="nx">$</span><span class="p">.</span><span class="nx">error</span><span class="p">(</span><span class="s1">&#39;Sketch.js did not recognize the given command.&#39;</span><span class="p">)</span>
2324
<span class="k">else</span> <span class="k">if</span> <span class="nx">sketch</span>

lib/sketch.js

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,13 @@ var __slice = Array.prototype.slice;
1313
sketch = this.data('sketch');
1414
if (typeof key === 'string' && sketch) {
1515
if (sketch[key]) {
16-
return sketch[key].apply(sketch, args);
17-
} else if (args.length === 1) {
18-
return sketch.set(key, args[0]);
19-
} else if (args.length === 0) {
20-
return sketch[key];
16+
if (typeof sketch[key] === 'function') {
17+
return sketch[key].apply(sketch, args);
18+
} else if (args.length === 0) {
19+
return sketch[key];
20+
} else if (args.length === 1) {
21+
return sketch[key] = args[0];
22+
}
2123
} else {
2224
return $.error('Sketch.js did not recognize the given command.');
2325
}

src/sketch.coffee

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,12 @@
2020
# (e.g. `.sketch('color','#f00')`.
2121
if typeof(key) == 'string' && sketch
2222
if sketch[key]
23-
sketch[key].apply sketch, args
24-
else if args.length == 1
25-
sketch.set key, args[0]
26-
else if args.length == 0
27-
sketch[key]
23+
if typeof(sketch[key]) == 'function'
24+
sketch[key].apply sketch, args
25+
else if args.length == 0
26+
sketch[key]
27+
else if args.length == 1
28+
sketch[key] = args[0]
2829
else
2930
$.error('Sketch.js did not recognize the given command.')
3031
else if sketch

0 commit comments

Comments
 (0)