Skip to content
This repository was archived by the owner on Mar 14, 2020. It is now read-only.
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
ab63c58
[Property View] Fix bug: Grid uses two types of form widget for interger
zeroooing Aug 28, 2012
25f3a0a
[Widgets] Add list widgets
Jul 31, 2012
bdbcf2b
[Widgets] Allow subtype to be treated as base type in type list checking
zhizhangchen Aug 1, 2012
0df704b
[ADM] Support child type morphing
zhizhangchen Aug 1, 2012
a0d86c3
[ADM] Add max and min limit of cardinality
zhizhangchen Aug 1, 2012
5d7a005
[Widgets] Extend zones more gracefully
zhizhangchen Aug 3, 2012
f4af4bf
[Widgets] Enable using function as a zone's "allow" field
zhizhangchen Aug 6, 2012
f74ce2c
[Widgets] Implement list widgets using generic item and button
Jul 31, 2012
8930b88
[Widgets] Implement ordered list as a property of ListBase
zhizhangchen Aug 7, 2012
70ec2f2
[Widgets] Change name of SimpleSplitList to ButtonSplitList
zhizhangchen Aug 7, 2012
1f53b3f
[Widgets] Introduce default htmlSelector
zhizhangchen Aug 7, 2012
e917506
[Widgets] Extract text property to BCommonProperties
zhizhangchen Aug 7, 2012
27086a3
[Widgets] Collapse split list button into SplitListItem
zhizhangchen Aug 7, 2012
500be54
[Widgets] Collapse list button into ListItem
Aug 8, 2012
9dfc8e6
[Widgets] Introduce multiple inheritance
zhizhangchen Aug 8, 2012
d260e62
[Widgets] Use multiple inheritance to implement split list widgets
zhizhangchen Aug 8, 2012
2ec8ee0
[Widgets] Remove unused svg files and display labels
zhizhangchen Aug 9, 2012
fd5849a
[Widgets] Enable count bubble on all list types
zhizhangchen Aug 21, 2012
d3bb883
[FileIO] Support themes in root directory of sandbox when exporting
DonnaWuDongxia Aug 21, 2012
03e9feb
[Layout View] Revert css changes in 8ee0558e
zhizhangchen Aug 22, 2012
499e822
[ADM] Use moveNode to insert child if old parent is not null
zhizhangchen Aug 24, 2012
d4fede6
[Layout View] Use a new algorithm for sorting
zhizhangchen Aug 24, 2012
5b7d9f8
[Layout View] Fix focus styling problem
zhizhangchen Aug 27, 2012
2141541
[Widgets] Change iconsrc property display name to Icon Source
zhizhangchen Aug 27, 2012
d91d22e
[Palette View] Rearrange widget positions
zhizhangchen Aug 29, 2012
d288bfb
[General] Don't treat url started with "src" to be in sandbox
zhizhangchen Aug 31, 2012
3b294d4
[Property View] Fix bug: Can't bring up upload dialog
zhizhangchen Aug 31, 2012
2093597
[Live View] Update recently used list when deleting a device
zhizhangchen Aug 31, 2012
2531876
[Live View] Fix RIB-9: Not checking device size when rotating
zhizhangchen Aug 31, 2012
eaac1af
[Live View] Fix RIB-29 Height becomes floating number when adding device
zhizhangchen Aug 31, 2012
e8f93f4
[Outline View] Fix RIB-31 Tab doesn't work to get in and out of outli…
zhizhangchen Aug 31, 2012
50b1207
[Live View] Fix RIB-24 long device name displaying problem
zhizhangchen Aug 31, 2012
372b988
[Code View] Fix RIB-5: No code selected when switching to code view
zhizhangchen Aug 31, 2012
5512373
[Property View] Fix bug: Add/Remove SelectMenu option refresh issue.
Aug 31, 2012
f5fa8d9
[Layout View] Fix RIB-19: Insertion line should not show up in illega…
zhizhangchen Aug 31, 2012
42f8141
Merge branch 'lists' into integration-20120831
zhizhangchen Aug 31, 2012
dc56f61
Merge branch 'insertion-line-in-illegal-place' into integration-20120831
zhizhangchen Aug 31, 2012
68cdfd6
Merge branch 'code-view-no-selection' into integration-20120831
zhizhangchen Aug 31, 2012
8f1e314
Merge branch 'long-device-name' into integration-20120831
zhizhangchen Aug 31, 2012
7024f75
Merge branch 'tab-in-outline-view' into integration-20120831
zhizhangchen Aug 31, 2012
53d90a6
Merge branch 'device-size' into integration-20120831
zhizhangchen Aug 31, 2012
eab341c
Merge branch 'delete-recently-used-device' into integration-20120831
zhizhangchen Aug 31, 2012
25e0889
Merge branch 'GridView' into integration-20120831
zhizhangchen Aug 31, 2012
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
<body class="vbox fullsize">
<script src="lib/jquery-1.6.4.min.js"></script>
<script src="lib/jquery-ui-1.8.16.custom.min.js"></script>
<script src="src/js/jquery-workarounds.js"></script>
<script src="src/js/msg-box.js"></script>
<script src="src/js/events.js"></script>
<script src="src/js/widgets.js"></script>
Expand All @@ -35,7 +36,6 @@
<script src="src/js/projects.js"></script>
<script src="src/js/serialize.js"></script>
<!-- New stuff from here ... -->
<script src="src/js/jquery-workarounds.js"></script>
<script src="src/js/jquery-plugins.js"></script>
<script src="src/js/views/base.js"></script>
<script src="src/js/views/tree.js"></script>
Expand Down
25 changes: 21 additions & 4 deletions src/assets/groups.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,27 @@
"Boolean": ["#0._hidden_node.jqm_input_boolean"]
}
],
"List Views": [
"List", "OrderedList", "ListItem", "ListDivider", "ListButton"
],
"Image": ["Image"]
"Image": ["Image"],
"List Views": [ {
"Single Lists": [
"SimpleListItem",
"ListDivider",
"SimpleList",
"ButtonList",
"TextList",
"IconList",
"ThumbnailList"
],
"Split Lists": [
"SimpleListItem",
"ListDivider",
"ButtonSplitList",
"TextSplitList",
"IconSplitList",
"ThumbnailSplitList"
]
}
]
}
],

Expand Down
8 changes: 6 additions & 2 deletions src/css/builder.css
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@ body.ui-tabs.ui-widget {
position: relative;
display: inline-block;
zoom: 1;
width: 102px;
width: 115px;
z-index: 999;
}
.view.live .deviceSelect > a {
Expand Down Expand Up @@ -418,6 +418,10 @@ body.ui-tabs.ui-widget {
left: 120px;
top: 0px;
}
#deviceSelectMenu li ul li {
overflow: hidden;
text-overflow: ellipsis
}
.view.live .deviceSelect .arrow b {
display: block;
}
Expand Down Expand Up @@ -929,7 +933,7 @@ div.propertyItems > div > * {
display: table-cell;
padding-bottom: 8px;
}
table#selectOption {
table.selectTable {
width: 100%;
}
div.propertyItems label[for] {
Expand Down
2 changes: 1 addition & 1 deletion src/css/composer.css
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
/*************************/
/* Class specific tweaks */
/*************************/
.nrc-sortable-container.ui-content .adm-node {
.nrc-sortable-container.ui-content > * {
margin-top: 10px;
margin-bottom: 10px;
}
Expand Down
44 changes: 44 additions & 0 deletions src/css/images/widgets/jqm_button_list.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/css/images/widgets/jqm_button_split_list.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/css/images/widgets/jqm_icon_list.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
26 changes: 26 additions & 0 deletions src/css/images/widgets/jqm_icon_list_button.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/css/images/widgets/jqm_icon_split_list.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/css/images/widgets/jqm_list.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
31 changes: 0 additions & 31 deletions src/css/images/widgets/jqm_list_split_button.svg

This file was deleted.

44 changes: 44 additions & 0 deletions src/css/images/widgets/jqm_text_list.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/css/images/widgets/jqm_text_list_button.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/css/images/widgets/jqm_text_split_list.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/css/images/widgets/jqm_thumbnail_list.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
26 changes: 26 additions & 0 deletions src/css/images/widgets/jqm_thumbnail_list_button.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading