diff options
| author | Eric Guzman | 2012-06-20 19:42:03 -0700 |
|---|---|---|
| committer | Eric Guzman | 2012-06-20 19:42:03 -0700 |
| commit | 3270aac4980c908f305fb53abadda5121ff6b9cb (patch) | |
| tree | 6255aaab239fde71b1f4862dd70de7be62f48b85 /js/components/toolbar.reel | |
| parent | a5d93daf6fdccbfee160d6a8ba08f6b6d4b9d7cc (diff) | |
| parent | 87377c81da06abf6d656017859830a3ab2902f0e (diff) | |
| download | ninja-3270aac4980c908f305fb53abadda5121ff6b9cb.tar.gz | |
Merge branch 'binding' of github.com:dhg637/ninja-internal into binding
Diffstat (limited to 'js/components/toolbar.reel')
| -rw-r--r-- | js/components/toolbar.reel/toolbar-button.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/components/toolbar.reel/toolbar-button.js b/js/components/toolbar.reel/toolbar-button.js index 74129c2a..cfa86f76 100644 --- a/js/components/toolbar.reel/toolbar-button.js +++ b/js/components/toolbar.reel/toolbar-button.js | |||
| @@ -6,7 +6,7 @@ | |||
| 6 | 6 | ||
| 7 | var Montage = require("montage").Montage, | 7 | var Montage = require("montage").Montage, |
| 8 | Component = require("montage/ui/component").Component, | 8 | Component = require("montage/ui/component").Component, |
| 9 | Button = require("montage/ui/button.reel/button").Button; | 9 | Button = require("montage/ui/native/button.reel/button").Button; |
| 10 | 10 | ||
| 11 | var ToolbarButton = exports.ToolbarButton = Montage.create(Button, { | 11 | var ToolbarButton = exports.ToolbarButton = Montage.create(Button, { |
| 12 | hasTemplate : { | 12 | hasTemplate : { |