diff options
| author | Armen Kesablyan | 2012-05-23 14:34:58 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-05-23 14:34:58 -0700 |
| commit | c21db7f1e4a0582777bdb5366df5d023a915b779 (patch) | |
| tree | c4d29cb4686101d4a480ae836d20187879cf5400 /js | |
| parent | 3ed95247e9ea4b0a7833401ed6809647b7c4acbf (diff) | |
| parent | 1a7e347810401e6262d9d7bad1c3583e6773993b (diff) | |
| download | ninja-c21db7f1e4a0582777bdb5366df5d023a915b779.tar.gz | |
Merge branch 'refs/heads/dom-architecture' into binding
Conflicts:
js/data/panels-data.js
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js')
103 files changed, 5663 insertions, 1258 deletions
diff --git a/js/components/controllers/tree-controller.js b/js/components/controllers/tree-controller.js index 1e9222fd..cb95ca1d 100644 --- a/js/components/controllers/tree-controller.js +++ b/js/components/controllers/tree-controller.js | |||
| @@ -23,6 +23,16 @@ var Montage = require("montage").Montage, | |||
| 23 | */ | 23 | */ |
| 24 | var TreeController = exports.TreeController = Montage.create(ObjectController, /** @lends module:montage/ui/controller/tree-controller.TreeController# */ { | 24 | var TreeController = exports.TreeController = Montage.create(ObjectController, /** @lends module:montage/ui/controller/tree-controller.TreeController# */ { |
| 25 | 25 | ||
| 26 | _delegate : { value: null }, | ||
| 27 | delegate : { | ||
| 28 | get: function() { | ||
| 29 | return this._delegate; | ||
| 30 | }, | ||
| 31 | set: function(value) { | ||
| 32 | this._delegate = value; | ||
| 33 | } | ||
| 34 | }, | ||
| 35 | |||
| 26 | rootKey : { | 36 | rootKey : { |
| 27 | value: null | 37 | value: null |
| 28 | }, | 38 | }, |
diff --git a/js/components/editable.reel/editable.js b/js/components/editable.reel/editable.js index dad93b31..103e418f 100644 --- a/js/components/editable.reel/editable.js +++ b/js/components/editable.reel/editable.js | |||
| @@ -40,7 +40,9 @@ exports.Editable = Montage.create(Component, { | |||
| 40 | this._element.addEventListener('keydown', this, false); | 40 | this._element.addEventListener('keydown', this, false); |
| 41 | this._element.addEventListener('keyup', this, false); | 41 | this._element.addEventListener('keyup', this, false); |
| 42 | this._element.addEventListener('input', this, false); | 42 | this._element.addEventListener('input', this, false); |
| 43 | 43 | this._element.addEventListener('paste', this, false); | |
| 44 | |||
| 45 | |||
| 44 | if(this.startOnEvent) { | 46 | if(this.startOnEvent) { |
| 45 | this._element.addEventListener(this.startOnEvent, this, false); | 47 | this._element.addEventListener(this.startOnEvent, this, false); |
| 46 | } | 48 | } |
| @@ -126,7 +128,7 @@ exports.Editable = Montage.create(Component, { | |||
| 126 | if(this.stopOnBlur) { | 128 | if(this.stopOnBlur) { |
| 127 | //console.log('adding mousedown event listener'); | 129 | //console.log('adding mousedown event listener'); |
| 128 | ///// Simulate blur on editable node by listening to the doc | 130 | |