diff options
author | Armen Kesablyan | 2012-06-20 15:16:30 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-06-20 15:16:30 -0700 |
commit | 65b989c7759af923fb9456d34bff89f91831ea1e (patch) | |
tree | e408be732a3eee71229bfc7dbf7cace998ce18de /node_modules/montage/data/restriction.js | |
parent | 38f571d1fdf02d36c3816637af7b2ca2493809da (diff) | |
parent | fc818d31de267d2b77fda3b3029ad38d48698be8 (diff) | |
download | ninja-65b989c7759af923fb9456d34bff89f91831ea1e.tar.gz |
Merge branch 'refs/heads/master' into binding
Conflicts:
node_modules/montage/ui/application.js
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'node_modules/montage/data/restriction.js')
-rwxr-xr-x | node_modules/montage/data/restriction.js | 61 |
1 files changed, 31 insertions, 30 deletions
diff --git a/node_modules/montage/data/restriction.js b/node_modules/montage/data/restriction.js index 53c2f19d..3a4896b8 100755 --- a/node_modules/montage/data/restriction.js +++ b/node_modules/montage/data/restriction.js | |||
@@ -1,36 +1,36 @@ | |||
1 | /* <copyright> | 1 | /* <copyright> |
2 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | 2 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> |
3 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | 3 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> |
4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | 4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. |
5 | </copyright> */ | 5 | </copyright> */ |
6 | /** | 6 | /** |
7 | @module montage/data/restriction | 7 | @module montage/data/restriction |
8 | @requires montage/core/core | 8 | @requires montage/core/core |
9 | @requires montage/core/logger | 9 | @requires montage/core/logger |
10 | */ | 10 | */ |
11 | var Montage = require("montage").Montage; | 11 | var Montage = require("montage").Montage; |
12 | // var Selector = require("data/selector").Selector; | ||
13 | var logger = require("core/logger").logger("restrictions"); | 12 | var logger = require("core/logger").logger("restrictions"); |
14 | /** | 13 | /** |
15 | @class module:montage/data/restriction.Restriction | 14 | @class module:montage/data/restriction.Restriction |
16 | @extends module:montage/core/core.Montage | 15 | @extends module:montage/core/core.Montage |
17 | */ | 16 | */ |
18 | var Restriction = exports.Restriction = Montage.create(Montage,/** @lends module:montage/data/restriction.Restriction# */ { | 17 | var Restriction = exports.Restriction = Montage.create(Montage, /** @lends module:montage/data/restriction.Restriction# */ { |
19 | /** | 18 | /** |
20 | Description TODO | 19 | Description TODO |
21 | @type {Property} | 20 | @type {Property} |
22 | @default {String} "" | 21 | @default {String} "" |
23 | */ | 22 | */ |
24 | name: { | 23 | name: { |
25 | serializable: true, | 24 | serializable: true, |
26 | enumerable: true, | 25 | enumerable: true, |
27 | value: "" | 26 | value: "" |
28 | }, | 27 | }, |
29 | /** | 28 | |
30 | Description TODO | 29 | /** |
31 | @type {Property} | 30 | Description TODO |
32 | @default {String}{} | 31 | @type {Property} |
33 | */ | 32 | @default {String}{} |
33 | */ | ||
34 | parameters: { | 34 | parameters: { |
35 | value: {}, | 35 | value: {}, |
36 | serializable: true, | 36 | serializable: true, |
@@ -38,13 +38,14 @@ var Restriction = exports.Restriction = Montage.create(Montage,/** @lends module | |||
38 | enumerable: false, | 38 | enumerable: false, |
39 | writable: false | 39 | writable: false |
40 | }, | 40 | }, |
41 | /** | 41 | |
42 | Description TODO | 42 | /** |
43 | @function | 43 | Description TODO |
44 | @param {String} name To be initialized | 44 | @function |
45 | @param {String} parameters To be initialized | 45 | @param {String} name To be initialized |
46 | @returns itself | 46 | @param {String} parameters To be initialized |
47 | */ | 47 | @returns itself |
48 | */ | ||
48 | initWithNameAndParameters: { | 49 | initWithNameAndParameters: { |
49 | enumerable: false, | 50 | enumerable: false, |
50 | value: function(name, parameters) { | 51 | value: function(name, parameters) { |