diff --git a/src/css/images/widgets/jqm_list_split_button.svg b/src/css/images/widgets/jqm_list_split_button.svg
deleted file mode 100644
index 2411051f..00000000
--- a/src/css/images/widgets/jqm_list_split_button.svg
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
diff --git a/src/css/images/widgets/jqm_text_list.svg b/src/css/images/widgets/jqm_text_list.svg
new file mode 100644
index 00000000..a093acef
--- /dev/null
+++ b/src/css/images/widgets/jqm_text_list.svg
@@ -0,0 +1,44 @@
+
+
+
diff --git a/src/css/images/widgets/jqm_text_list_button.svg b/src/css/images/widgets/jqm_text_list_button.svg
new file mode 100644
index 00000000..7bee4b5c
Binary files /dev/null and b/src/css/images/widgets/jqm_text_list_button.svg differ
diff --git a/src/css/images/widgets/jqm_text_split_list.svg b/src/css/images/widgets/jqm_text_split_list.svg
new file mode 100644
index 00000000..f9faa178
Binary files /dev/null and b/src/css/images/widgets/jqm_text_split_list.svg differ
diff --git a/src/css/images/widgets/jqm_thumbnail_list.svg b/src/css/images/widgets/jqm_thumbnail_list.svg
new file mode 100644
index 00000000..0538fc87
Binary files /dev/null and b/src/css/images/widgets/jqm_thumbnail_list.svg differ
diff --git a/src/css/images/widgets/jqm_thumbnail_list_button.svg b/src/css/images/widgets/jqm_thumbnail_list_button.svg
new file mode 100644
index 00000000..2dfb18aa
--- /dev/null
+++ b/src/css/images/widgets/jqm_thumbnail_list_button.svg
@@ -0,0 +1,26 @@
+
+
diff --git a/src/css/images/widgets/jqm_thumbnail_split_list.svg b/src/css/images/widgets/jqm_thumbnail_split_list.svg
new file mode 100644
index 00000000..309ee419
Binary files /dev/null and b/src/css/images/widgets/jqm_thumbnail_split_list.svg differ
diff --git a/src/js/adm.js b/src/js/adm.js
index 364f82fa..7d2c5582 100644
--- a/src/js/adm.js
+++ b/src/js/adm.js
@@ -518,7 +518,7 @@ ADM.endTransaction = function () {
* @return {ADMNode} The child object, on success; null, on failure.
*/
ADM.addChild = function (parentRef, childRef, dryrun) {
- var parent, child;
+ var parent, child, oldParent, oldType, oldZone, oldZoneIndex;
parent = ADM.toNode(parentRef);
if (!parent) {
@@ -538,6 +538,12 @@ ADM.addChild = function (parentRef, childRef, dryrun) {
return null;
}
+ oldParent = child.getParent();
+ if (oldParent) {
+ oldType = child.getType();
+ oldZone = child.getZone();
+ oldZoneIndex = child.getZoneIndex();
+ }
if (parent.addChild(child, dryrun)) {
if (dryrun) {
return true;
@@ -547,7 +553,11 @@ ADM.addChild = function (parentRef, childRef, dryrun) {
ADM.transaction({
type: "add",
parent: child.getParent(),
- child: child
+ child: child,
+ oldParent: oldParent,
+ oldType: oldType,
+ oldZone: oldZone,
+ oldZoneIndex: oldZoneIndex
});
return child;
}
@@ -634,7 +644,7 @@ ADM.addChildRecursive = function (parentRef, childRef, dryrun) {
* @private
*/
ADM.insertChildRelative = function (siblingRef, childRef, offset, dryrun) {
- var sibling, child;
+ var sibling, child, oldParent, oldType, oldZone, oldZoneIndex;
sibling = ADM.toNode(siblingRef);
if (!sibling) {
@@ -655,6 +665,12 @@ ADM.insertChildRelative = function (siblingRef, childRef, offset, dryrun) {
childRef);
}
+ oldParent = child.getParent();
+ if (oldParent) {
+ oldType = child.getType();
+ oldZone = child.getZone();
+ oldZoneIndex = child.getZoneIndex();
+ }
if (sibling.insertChildRelative(child, offset, dryrun)) {
if (dryrun) {
return true;
@@ -663,7 +679,11 @@ ADM.insertChildRelative = function (siblingRef, childRef, offset, dryrun) {
type: "insertRelative",
sibling: sibling,
child: child,
- offset: offset
+ offset: offset,
+ oldParent: oldParent,
+ oldType: oldType,
+ oldZone: oldZone,
+ oldZoneIndex: oldZoneIndex
});
return child;
}
@@ -921,7 +941,14 @@ ADM.undo = function () {
var obj, undo = function (obj) {
if (obj.type === "add") {
ADM.ensurePageInactive(obj.child);
- obj.parent.removeChild(obj.child);
+ if (obj.oldParent) {
+ if (obj.oldType !== obj.child.getType())
+ obj.child.morphTo(obj.oldType);
+ obj.child.moveNode(obj.oldParent, obj.oldZone, obj.oldZoneIndex);
+ ADM.setSelected(obj.child);
+ }
+ else
+ obj.parent.removeChild(obj.child);
}
else if (obj.type === "remove") {
obj.parent.insertChildInZone(obj.child, obj.zone, obj.zoneIndex);
@@ -932,7 +959,14 @@ ADM.undo = function () {
ADM.setSelected(obj.node);
}
else if (obj.type === "insertRelative") {
- obj.sibling.getParent().removeChild(obj.child);
+ if (obj.oldParent) {
+ if (obj.oldType !== obj.child.getType())
+ obj.child.morphTo(obj.oldType);
+ obj.child.moveNode(obj.oldParent, obj.oldZone, obj.oldZoneIndex);
+ ADM.setSelected(obj.child);
+ }
+ else
+ obj.sibling.getParent().removeChild(obj.child);
}
else if (obj.type === "propertyChange") {
// TODO: this could require deeper copy of complex properties
@@ -1167,18 +1201,8 @@ function ADMNode(widgetType) {
var currentType = widgetType, widget, zones, length, i, func;
this._valid = false;
- this._inheritance = [];
-
- while (currentType) {
- widget = BWidgetRegistry[currentType];
- if (typeof widget === "object") {
- this._inheritance.push(currentType);
- currentType = widget.parent;
- } else {
- console.error("Error: invalid type hierarchy creating ADM node");
- return;
- }
- }
+ this._inheritance = [widgetType];
+ $.merge(this._inheritance, BWidget.getAncestors(widgetType));
this._uid = ++ADMNode.prototype._lastUid;
@@ -1487,7 +1511,7 @@ ADMNode.prototype.findNodesByProperty = function (propertyFilter) {
// recurse on children
children = this.getChildren();
- for (i = children.length - 1; i >= 0; i--) {
+ for (i = 0; i < children.length; i++) {
result = result.concat(children[i].findNodesByProperty(propertyFilter));
}
return result;
@@ -1574,6 +1598,18 @@ ADMNode.prototype.getChildrenCount = function () {
return count;
};
+/**
+ * Tests whether this node has has event handlers.
+ *
+ * @return {Boolean} True if the node has at least one event handler.
+ */
+
+ADMNode.prototype.hasEventHandlers = function() {
+ return !$.isEmptyObject(this.getMatchingProperties(
+ {type: 'event', value: /.+/}
+ ));
+}
+
/**
* Tests whether this node has user-visible descendants that will be displayed
* in the outline view.
@@ -1599,6 +1635,18 @@ ADMNode.prototype.hasUserVisibleDescendants = function () {
return false;
};
+/**
+ * Change this node to another type
+ *
+ * @param {String} type The type this node will morph to.
+ * @return {ADMNode} The morphed node.
+ */
+ADMNode.prototype.morphTo = function (type) {
+ var morphedChild = ADM.createNode(type);
+ this._inheritance = morphedChild._inheritance;
+ this._zones = morphedChild._zones;
+ return this;
+};
/**
* Adds given child object to this object, generally at the end of the first
* zone that accepts the child.
@@ -1666,11 +1714,19 @@ ADMNode.prototype.addChild = function (child, dryrun) {
ADMNode.prototype.addChildToZone = function (child, zoneName, zoneIndex,
dryrun) {
// requires: assumes cardinality is "N", or a numeric string
- var add = false, myType, childType, zone, cardinality, limit;
+ var add = false, myType, childType, zone, cardinality, limit, morph,
+ morphedChildType, morphedChild;
myType = this.getType();
childType = child.getType();
zone = this._zones[zoneName];
+ morph = BWidget.getZone(myType, zoneName).morph;
+ if (morph) {
+ morphedChildType = morph(childType, myType);
+ if (morphedChildType !== childType) {
+ childType = morphedChildType;
+ }
+ }
if (!BWidget.zoneAllowsChild(myType, zoneName, childType)) {
if (!dryrun) {
console.warn("Warning: zone " + zoneName +
@@ -1693,6 +1749,7 @@ ADMNode.prototype.addChildToZone = function (child, zoneName, zoneIndex,
return false;
}
+ cardinality = cardinality.max || cardinality;
if (cardinality !== "N") {
limit = parseInt(cardinality, 10);
if (zone.length >= limit) {
@@ -1777,7 +1834,8 @@ ADMNode.prototype.insertChildInZone = function (child, zoneName, index,
}
}
- var zone = this._zones[zoneName];
+ var zone = this._zones[zoneName], oldParent,
+ myType, childType, morph, morphedChildType;
if (!zone) {
console.error("Error: zone not found in insertChildInZone: " +
zoneName);
@@ -1788,7 +1846,18 @@ ADMNode.prototype.insertChildInZone = function (child, zoneName, index,
return false;
}
if (child instanceof ADMNode) {
+ oldParent = child.getParent();
+ if (oldParent)
+ return child.moveNode(this, zoneName, index, dryrun);
if (!dryrun) {
+ myType = this.getType();
+ childType = child.getType();
+ morph = BWidget.getZone(myType, zoneName).morph;
+ if (morph) {
+ morphedChildType = morph(childType, myType);
+ if (morphedChildType != childType)
+ child.morphTo(morphedChildType);
+ }
zone.splice(index, 0, child);
setRootRecursive(child, this._root);
@@ -1845,6 +1914,9 @@ ADMNode.prototype.moveNode = function (newParent, zoneName, zoneIndex, dryrun) {
oldZone = this._zone;
oldIndex = this.getZoneIndex();
removed = oldParent.removeChild(this, dryrun);
+ if (oldParent === newParent && oldZone === zoneName
+ && oldIndex < zoneIndex)
+ zoneIndex --;
if (removed) {
if (removed != this) {
@@ -1904,12 +1976,30 @@ ADMNode.prototype.removeChild = function (child, dryrun) {
* @return {ADMNode} The removed child, or null if not found.
*/
ADMNode.prototype.removeChildFromZone = function (zoneName, index, dryrun) {
- var zone, removed, child, parentNode, parent;
+ var zone, removed, child, parent, cardinality, min;
zone = this._zones[zoneName];
if (!zone) {
console.error("Error: no such zone found while removing child: " +
zoneName);
}
+ cardinality = BWidget.getZoneCardinality(this.getType(), zoneName);
+ if (!cardinality) {
+ console.warn("Warning: no cardinality found for zone " + zoneName);
+ return false;
+ }
+
+ if (cardinality.min) {
+ min = parseInt(cardinality.min, 10);
+
+ if (zone.length <= min) {
+ alert("At least "
+ + cardinality.min + " "
+ + BWidget.getDisplayLabel(zone[index].getType())
+ + (min === 1 ? " " : "s ")
+ + (min === 1 ? "is": "are") + " required and cannot be deleted!");
+ return false;
+ }
+ }
if (dryrun) {
removed = [zone[index]];
@@ -1960,11 +2050,15 @@ ADMNode.prototype.foreach = function (func) {
* @param {String} The name of the property.
* @return {String} The generated property value.
*/
-ADMNode.prototype.generateUniqueProperty = function (property) {
+ADMNode.prototype.generateUniqueProperty = function (property, force) {
var generate, design, myType, length, i, genLength, max, num, existing = [];
myType = this.getType();
generate = BWidget.getPropertyAutoGenerate(myType, property);
- if (!generate) {
+ // If force argument is set, then set the generate as myType and continue
+ // to run.
+ if (!generate && force) {
+ generate = myType.toLowerCase();
+ } else if (!generate) {
return undefined;
}
@@ -2230,8 +2324,9 @@ ADMNode.prototype.isPropertyExplicit = function (property) {
* relevant info for performing an undo of this operation.
*/
ADMNode.prototype.setProperty = function (property, value, data, raw) {
- var orig, func, changed, type, rval = { }, defaultValue;
- type = BWidget.getPropertyType(this.getType(), property);
+ var orig, func, changed, rval = { }, defaultValue,
+ type = BWidget.getPropertyType(this.getType(), property);
+
if (!type) {
console.error("Error: attempted to set non-existent property: " +
property);
@@ -2249,14 +2344,15 @@ ADMNode.prototype.setProperty = function (property, value, data, raw) {
}
}
- // TODO: In HTML5 the rules for ids are not this strict, so this should be
- // corrected with reference to the spec.
- // HTML id naming rules:
- // Must begin with a letter A-Z or a-z
+ // TODO: In HTML5 the rules for ids are not this strict, but JQM and jQuery don't work well
+ // with special chars, such as "$" "%" "/" accepted by HTML5.
+ //
+ // So we use the following id naming rules:
+ // Must begin with a letter A-Z or a-z or 0-9
// Can be followed by: letters (A-Za-z), digits (0-9), hyphens ("-"), and underscores ("_")
// In HTML, all values are case-insensitive
if (property == "id") {
- var pattern = /^[a-zA-Z]([\w-]*)$/;
+ var pattern = /^[a-zA-Z0-9]([\w-]*)$/;
if (value && !pattern.test(value)) {
console.error("Error: attempted to set invalid id");
return rval;
@@ -2300,6 +2396,14 @@ ADMNode.prototype.setProperty = function (property, value, data, raw) {
{ type: "propertyChanged", node: this,
property: property, oldValue: orig,
newValue: value });
+
+ // Event handler saving after ID/event property changed.
+ if (property === 'id') {
+ if (this.hasEventHandlers())
+ $.rib.saveEventHandlers();
+ } else if (type === 'event') {
+ $.rib.saveEventHandlers();
+ }
rval.result = true;
}
return rval;
diff --git a/src/js/composer.js b/src/js/composer.js
index 7f85a8c7..22170d96 100644
--- a/src/js/composer.js
+++ b/src/js/composer.js
@@ -279,58 +279,6 @@ $(function() {
}
};
- var addNewNodeOnDrop = function (domParent, domChildren, adm, pid,
- nodeRef, role, domNode) {
- var newNode, domSibling, sid, admChildren, domIndex, debug;
-
- debug = (window.top.$.rib && window.top.$.rib.debug());
- domIndex = domChildren.index(domNode);
-
- // Append first(only)/last child to this container
- if (domIndex >= domChildren.length-1 || role === 'page') {
- if (adm.addChild(pid, nodeRef, true)) {
- newNode = adm.addChild(pid, nodeRef);
- debug && console.log('Appended node',role);
- newNode && adm.setSelected(newNode);
- } else {
- console.warn('Append child failed:',role);
- }
- } else if (domIndex > 0) {
- // Insert nth child into this container
- domSibling = $(domNode, domParent).prev('.adm-node');
- sid = domSibling.attr('data-uid');
- if (adm.insertChildAfter(sid, nodeRef, true)) {
- newNode = adm.insertChildAfter(sid, nodeRef);
- debug && console.log('Inserted nth node',role);
- newNode && adm.setSelected(newNode);
- } else {
- console.warn('Insert nth child failed:',role);
- }
- } else {
- // Add 1st child into an empty container
- if (domChildren.length-1 <= 0) {
- if (adm.addChild(pid, nodeRef, true)) {
- newNode = adm.addChild(pid, nodeRef);
- debug && console.log('Added 1st node',role);
- newNode && adm.setSelected(newNode);
- } else {
- console.warn('Add 1st child failed:',role);
- }
- } else {
- // Insert 1st child into non-empty container
- admChildren = adm.toNode(pid).getChildren();
- sid = admChildren.length && admChildren[0].getUid();
- if (adm.insertChildBefore(sid, nodeRef, true)) {
- newNode = adm.insertChildBefore(sid, nodeRef);
- debug && console.log('Inserted 1st node', role);
- newNode && adm.setSelected(newNode);
- } else {
- console.warn('Insert 1st child failed:', role);
- }
- }
- }
- };
-
window.top.$.rib = window.top.$.rib || {};
window.top.$.rib.dndfilter = dndfilter;
@@ -377,7 +325,7 @@ $(function() {
}
};
$(e.target).subtree().add(document)
- .unbind('click vmousedown vmousecancel vmouseup vmouseover focus'
+ .unbind('click vmousedown vmousecancel vmouseup vmouseover focus focusin'
+ ' vmouseout blur mousedown touchmove');
$(e.target).subtree('.adm-node:not(.delegation),.orig-adm-node').each(
@@ -550,6 +498,7 @@ $(function() {
'> .ui-collapsible-content > .adm-node,' +
'> ul > li.adm-node,' +
'> div > .adm-node,' +
+ '> div > div > a > .adm-node,' +
'> *.orig-adm-node:not(.ui-header,.ui-content,.ui-footer)',
start: function(event, ui){
trackOffsets('start: ',ui,$(this).data('sortable'));
@@ -634,16 +583,14 @@ $(function() {
},
stop: function(event, ui){
trackOffsets('stop: ',ui,$(this).data('sortable'));
- var type, isDrop,
+ var isDrop,
pid = $(this).attr('data-uid'),
- node = null,
adm = window.parent.ADM,
- bw = window.parent.BWidget,
root = adm.getDesignRoot(),
- node, zones, newParent, newZone,
- rdx, idx, cid, pid, sid,
+ nodeRef, newParent, newNode,
+ cid, pid,
sibling, children, parent,
- role, card;
+ role, prevItem = ui.item, nextItem = ui.item;
role = $(this).attr('data-role') || '';
@@ -694,87 +641,50 @@ $(function() {
ui.item.remove();
return false;
}
-
- // Drop from palette: add a node
if (isDrop) {
if (ui.item.data('adm-node')) {
- type = ui.item.data('adm-node').type;
+ nodeRef = ui.item.data('adm-node').type;
}
- if (!type) {
+ if (!nodeRef) {
console.warn('Drop failed: Missing node type');
ui.item.remove();
return false;
}
-
- children = $($(this).sortable('option', 'items'), this)
- .add(ui.item);
- addNewNodeOnDrop(this, children, adm, pid, type,
- role, ui.item);
- ui.item.remove();
- return;
-
- // Sorted from layoutView: move a node
- } else {
- children = ui.item.parent().children('.adm-node')
- .add(ui.item);
- idx = children.index(ui.item);
+ }
+ else {
cid = ui.item.attr('data-uid');
// closest() will select current element if it matches
// the selector, so we start with its parent.
+ nodeRef = cid && root.findNodeByUid(cid);
+ if (event && event.ctrlKey) {
+ nodeRef = adm.copySubtree(nodeRef);
+ }
+ }
+
+ while (prevItem[0] || nextItem[0]) {
+ prevItem = prevItem.prev('.adm-node');
+ if (prevItem[0] && (newNode = adm.insertChildAfter
+ (prevItem.attr('data-uid'), nodeRef)))
+ break;
+ nextItem = nextItem.next('.adm-node');
+ if (nextItem[0] && (newNode = adm.insertChildBefore
+ (nextItem.attr('data-uid'), nodeRef)))
+ break;
+ }
+ if (!prevItem[0] && !nextItem[0]) {
pid = ui.item.parent()
.closest('.adm-node.ui-sortable,'+
'.orig-adm-node.ui-sortable')
.attr('data-uid');
- node = cid && root.findNodeByUid(cid);
- if (event && event.ctrlKey) {
- node = adm.copySubtree(node); // Clone it
- addNewNodeOnDrop(this, children, adm, pid, node,
- role, ui.item);
- } else {
- newParent = pid && root.findNodeByUid(pid);
- zones = newParent && bw.getZones(newParent.getType());
- card = newParent && zones &&
- bw.getZoneCardinality(newParent.getType(),
- zones[0]);
-
- // Notify the ADM that element has been moved
- if ((zones && zones.length===1 && card !== '1')) {
- if (!node ||
- !adm.moveNode(node, newParent, zones[0],
- idx)) {
- console.warn('Move node failed');
- ui.item.remove();
- return false;
- } else {
- debug && console.log('Move node worked');
- if (node) adm.setSelected(node.getUid());
- }
- } else if (node && newParent &&
- newParent.getType() === 'Header') {
- for (var z=0; z < zones.length; z++) {
- if (adm.moveNode(node, newParent, zones[z],
- 0, true)) {
- newZone = zones[z];
- break;
- }
- }
- if (newZone) {
- adm.moveNode(node, newParent, newZone, 0);
- debug && console.log('Move node worked');
- if (node) adm.setSelected(node.getUid());
- } else {
- console.warn('Move node failed');
- ui.item.remove();
- return false;
- }
- } else {
- console.warn('Move node failed: invalid zone');
- ui.item.remove();
- return false;
- }
+ newParent = pid && root.findNodeByUid(pid);
+ if (!(newNode = adm.addChild(newParent, nodeRef))) {
+ ui.item.remove();
+ return true;
}
}
+ if (newNode)
+ adm.setSelected(newNode);
}
})
.bind('mousedown.composer', function(event) {
diff --git a/src/js/panel.js b/src/js/panel.js
index 56298096..35e6292a 100644
--- a/src/js/panel.js
+++ b/src/js/panel.js
@@ -237,6 +237,7 @@
});
self.openHandle
.fadeToggle('fast');
+ self.grip.nextAll().show();
}
// Close panel
@@ -245,6 +246,7 @@
self.element.animate({width: '16px'}, function() {
self.openHandle
.fadeToggle('fast');
+ self.grip.nextAll().hide();
});
self.closeToggle
.add(self.bg)
diff --git a/src/js/projects.js b/src/js/projects.js
index fbb8a852..841f8f55 100644
--- a/src/js/projects.js
+++ b/src/js/projects.js
@@ -27,7 +27,9 @@ $(function () {
// Filter to find sandbox resources
relativeFilter:{
type: "url-uploadable",
- value: /^(?!(https?|ftp):\/+).+/i
+ value: function (valueObject) {
+ return valueObject.inSandbox;
+ }
},
// Object to save refernce count for sandbox resource
resourceRef: {},
@@ -956,6 +958,7 @@ $(function () {
* @return {None}
*/
pmUtils.addRefCount = function (refPath) {
+ refPath = refPath.value || refPath;
if (!pmUtils.resourceRef[refPath]) {
pmUtils.resourceRef[refPath] = 1;
} else {
@@ -972,6 +975,7 @@ $(function () {
*/
pmUtils.reduceRefCount = function (refPath) {
var projectDir = pmUtils.ProjectDir + "/" + pmUtils.getActive() + "/";
+ refPath = refPath.value || refPath;
if (pmUtils.resourceRef.hasOwnProperty(refPath)) {
pmUtils.resourceRef[refPath]--;
// Delete the resource if the reference count is 0
diff --git a/src/js/serialize.js b/src/js/serialize.js
index 64f5b2cc..89af4beb 100644
--- a/src/js/serialize.js
+++ b/src/js/serialize.js
@@ -425,11 +425,23 @@ $(function () {
}
function getDesignHeaders(design, useSandboxUrl) {
- var i, props, el, designRoot, headers;
+ var i, props, el, designRoot, headers, toCorrectPath;
designRoot = design || ADM.getDesignRoot();
headers = [];
props = designRoot.getProperty('metas');
+ toCorrectPath = function (header) {
+ var path = header.value;
+ // If need to use sandbox url
+ if (header.inSandbox) {
+ if (useSandboxUrl) {
+ path = toSandboxUrl(path);
+ } else {
+ path = path.replace(/^\//, '');
+ }
+ }
+ return path;
+ };
for (i in props) {
// Skip design only header properties
if (props[i].hasOwnProperty('designOnly') && props[i].designOnly) {
@@ -444,12 +456,7 @@ $(function () {
if ((typeof props[i].value !== 'string') || (props[i].value.length <= 0)) {
continue;
}
- // If need to use sandbox url
- if (useSandboxUrl && props[i].inSandbox) {
- el = el + '="' + toSandboxUrl(props[i].value) + '"';
- } else {
- el = el + '="' + props[i].value + '"';
- }
+ el = el + '="' + toCorrectPath(props[i]) + '"';
if (props[i].hasOwnProperty('content')) {
el = el + ' content="' + props[i].content + '"';
}
@@ -470,11 +477,7 @@ $(function () {
}
el = '';
headers.push(el);
}
@@ -492,11 +495,7 @@ $(function () {
}
el = '';
headers.push(el);
}
@@ -659,7 +658,7 @@ $(function () {
for (p in matched) {
files.push({
"src": toSandboxUrl(matched[p]),
- "dst": matched[p]
+ "dst": matched[p].value ? matched[p].value : matched[p]
});
}
});
@@ -730,19 +729,23 @@ $(function () {
}
function toSandboxUrl(path, pid) {
- var projectDir, fullPath;
+ var projectDir, pathStr;
pid = pid || $.rib.pmUtils.getActive();
projectDir = $.rib.pmUtils.getProjectDir(pid);
- if (typeof path !== "string") {
- console.error("Invalid path in toSandboxUrl: " + path);
+ if ((path instanceof Object) && path.inSandbox) {
+ pathStr = path.value;
+ } else {
+ pathStr = path;
+ }
+ if (typeof pathStr !== "string") {
+ console.error("Invalid path in toSandboxUrl: " + pathStr);
return null;
}
- fullPath = path;
// If the first char is '/', then it will be the absolute path in sandbox
- if (path[0] !== '/' && projectDir) {
- fullPath = projectDir + path;
+ if (pathStr[0] !== '/' && projectDir) {
+ pathStr = projectDir + pathStr;
}
- return $.rib.fsUtils.pathToUrl(fullPath);
+ return $.rib.fsUtils.pathToUrl(pathStr);
}
function indexOfArray(array, value) {
@@ -907,6 +910,48 @@ $(function () {
}, error);
}
+ /**
+ * Save event handler codes to main.js
+ *
+ * @param {ADMNode} design ADM design root to be serialized.
+ *
+ * @return {None} as same as addCustomFile.
+ */
+ function saveEventHandlers(design) {
+ var results, id, matchedProps, eventCode, eventName,
+ design = design || ADM.getDesignRoot(),
+ jsFileName = 'js/main.js', jsType = 'js',
+ jsHeader = '$(document).ready(function(e) {\n',
+ jsContent = '',
+ jsFooter = '});';
+
+ // Regenerate the whole event javascript codes
+ // and save to sandbox.
+ results = design.findNodesByProperty(
+ {'type': 'event', 'value': new RegExp('.+')}
+ );
+ $.each(results, function(index, result) {
+ id = result.node.getProperty('id');
+ if (!id)
+ return
+ matchedProps = result.properties;
+ for (eventName in matchedProps) {
+ // Append the event code to the whole js code content.
+ jsContent += '$("#' + id + '").bind("' + eventName + '", function(e) {'
+ + '\n' + matchedProps[eventName] + '\n'
+ + '});\n\n';
+ }
+ });
+ if (!jsContent) {
+ removeSandboxHeader(jsType, jsFileName);
+ $.rib.fsUtils.rm(jsFileName);
+ return null;
+ }
+ return addCustomFile(
+ jsFileName, jsType, js_beautify(jsHeader + jsContent + jsFooter)
+ );
+ }
+
/***************** export functions out *********************/
// Export serialization functions into $.rib namespace
$.rib.generateHTML = generateHTML;
@@ -919,4 +964,5 @@ $(function () {
$.rib.addSandboxHeader = addSandboxHeader;
$.rib.removeSandboxHeader = removeSandboxHeader;
$.rib.addCustomFile = addCustomFile;
+ $.rib.saveEventHandlers = saveEventHandlers;
});
diff --git a/src/js/views/code.js b/src/js/views/code.js
index 38bc5137..ce22af5a 100644
--- a/src/js/views/code.js
+++ b/src/js/views/code.js
@@ -85,16 +85,7 @@
// Private functions
_createPrimaryTools: function() {
- var tools =$(''), button,
- commands = ['undo', 'redo', 'cut', 'copy', 'paste'];
-
- tools.addClass('hbox').hide();
- $.each(commands, function(i, t) {
- button =$('').addClass("buttonStyle ui-state-default")
- .attr('id', 'btn' + t)
- .appendTo(tools);
- });
- return tools;
+ return $(null);
},
_createSecondaryTools: function() {
diff --git a/src/js/views/layout.js b/src/js/views/layout.js
index e925c36c..98fa2f0f 100644
--- a/src/js/views/layout.js
+++ b/src/js/views/layout.js
@@ -428,15 +428,6 @@
// these lines.
$(domNode).removeAttr('disabled');
$(domNode).children().removeAttr('disabled');
-
- // Set default src for empty image to make them show up
- // TODO: This case may need to improve, such as we can show a box
- // with "empty image" message to notice the user
- if ((admNode.getType() === "Image") && (!admNode.getProperty('src'))) {
- if ($(domNode).is('img')) {
- $(domNode).attr('src', "src/css/images/widgets/tizen_image.svg");
- }
- }
}
});
})(jQuery);
diff --git a/src/js/views/project.js b/src/js/views/project.js
index 99c33a1b..2346012f 100644
--- a/src/js/views/project.js
+++ b/src/js/views/project.js
@@ -411,7 +411,7 @@
// and open it, create a new project in no project case
if (!$.rib.pmUtils.getActive()) {
$(document.body).one("tabsselect", function (e, tab) {
- if (tab.index === 1) {
+ if (tab.index !== 0) {
$.rib.pmUtils.showLastOpened();
}
});
diff --git a/src/js/views/property.js b/src/js/views/property.js
index d19ef861..8248f8fc 100644
--- a/src/js/views/property.js
+++ b/src/js/views/property.js
@@ -94,9 +94,11 @@
var labelId, labelVal, valueId, valueVal, count,
widget = this, type, i, child, index, propType,
p, props, options, code, o, propertyItems, label, value,
+ design = ADM.getDesignRoot(),
title = this.element.parent().find('.property_title'),
content = this.element.find('.property_content'),
- continueToDelete, container;
+ continueToDelete, buttonsContainer, container, range,
+ min, max;
// Clear the properties pane when nothing is selected
if (node === null || node === undefined) {
@@ -163,24 +165,40 @@
value.find("#" + valueId).attr("checked", "checked");
}
break;
+ case "integer":
+ range = BWidget.getPropertyRange(type, p);
+ if (range) {
+ min = range.split('-')[0];
+ max = range.split('-')[1];
+ $('')
+ .addClass('title labelInput')
+ .attr({
+ id: valueId,
+ min: min,
+ max: max
+ }).appendTo(value);
+ //set default value
+ value.find('#' + valueId).val(valueVal);
+ }
+ break;
case "url-uploadable":
$('')
.attr('id', valueId)
.addClass('title labelInput')
.appendTo(value);
//set default value
- value.find('#' + valueId).val(valueVal);
+ value.find('#' + valueId).val(valueVal.value);
$('')
.addClass('buttonStyle')
- .click(function (e) {
- var target, saveDir;
- target = $(this).prev("input:text");
- saveDir = $.rib.pmUtils.ProjectDir + "/" + $.rib.pmUtils.getActive() + "/images/";
+ .click({node:node, property:p}, function (e) {
+ var saveDir = $.rib.pmUtils.getProjectDir() + "images/";
$.rib.fsUtils.upload("image", $(this).parent(), function(file) {
// Write uploaded file to sandbox
$.rib.fsUtils.write(saveDir + file.name, file, function (newFile) {
- target.val("images/" + newFile.name);
- target.trigger('change');
+ ADM.setProperty(e.data.node, e.data.property, {
+ inSandbox: true,
+ value: "images/" + newFile.name
+ });
});
});
}).appendTo(value);
@@ -248,9 +266,15 @@
.end().end()
.append(' | ')
.children().eq(3)
- .append('![]()
')
+ .append('Remove')
.children(':first')
- .attr('src', "src/css/images/deleteButton_up.png")
+ .addClass('smallbutton')
+ .button({
+ text: false,
+ icons: {
+ primary: "ui-icon-trash"
+ }
+ })
// add delete option handler
.click(function(e) {
try {
@@ -380,14 +404,13 @@
.click({'p': p, 'value': value}, function(e) {
var o, items = "", pages, id,
value = e.data.value, p = e.data.p;
-
items += 'previous page';
container = node.getParent();
while (container !== null &&
container.getType() !== "Page") {
container = container.getParent();
}
- pages = ADM.getDesignRoot().getChildren();
+ pages = design.getChildren();
for (o = 0; o < pages.length; o++) {
if (pages[o] === container) {
continue;
@@ -466,12 +489,14 @@
if (selected.length > 0) {
$(this).val(selected.text());
}
- value = validValue($(this),
- BWidget.getPropertyType(node.getType(), updated));
+ value = validValue(
+ node, $(this),
+ BWidget.getPropertyType(node.getType(), updated)
+ );
ret = ADM.setProperty(node, updated, value);
type = node.getType();
if (ret.result === false) {
- $(this).val(node.getProperty(updated));
+ $(this).effect("highlight", {color: "red"}, 1000).val(node.getProperty(updated));
} else if (type === "Button" &&
value === "previous page") {
ADM.setProperty(node, "opentargetas", "default");
@@ -481,22 +506,355 @@
});
}
- // add delete element button
- $('')
+ // add buttons container
+ buttonsContainer = $('')
.addClass('property_footer')
- .children('button')
+ .appendTo(content)
+ .end();
+
+ // Add event handler button
+ $('
')
+ .addClass('buttonStyle')
+ .attr('id', "eventHandlerElement")
+ .appendTo(buttonsContainer)
+ .bind('click', function(e) {
+ var generateEventSelectElement, generateEventHandlersList,
+ removeEventHandler, eventLinkClicked;
+ var formContainer, leftPannel, leftPannelContainer,
+ rightPannel, eventElement, eventSelectElement,
+ eventEditorContainer, eventEditor, formElement,
+ jsCode, eventHandlersList, id,
+ uniqueIdName = 'id';
+
+ // If node have no ID property, then return directly.
+ if(typeof(BWidget.propertyExists(node.getType(), uniqueIdName)) == 'undefined') {
+ alert('Event handler must be using with the element have ID property.');
+ return false;
+ };
+
+ /*
+ * Call back functions.
+ */
+
+ // Remove event handler
+ removeEventHandler = function(e) {
+ e.preventDefault();
+ var eventName = $(this).parent().attr('rel');
+ $.rib.confirm(
+ 'Are you sure you want to delete the '
+ + eventName
+ + ' event handler?',
+ function() {
+ node.setProperty(eventName, '');
+ if (eventElement.val() == eventName)
+ eventEditor.setValue('');
+ formElement.trigger('submit');
+ }
+ );
+ }
+
+ // Event link clicked callback
+ eventLinkClicked = function(e) {
+ e.preventDefault();
+ var eventName = $(this).parent().attr('rel');
+ eventSelectElement.val(eventName);
+ formElement.trigger('submit');
+ }
+
+ /*
+ * Elements generation functions.
+ */
+
+ // Generate the event property select options.
+ generateEventSelectElement = function(selectElement, matchedProps) {
+ var selected, newSelectElement, result, matchedProps,
+ optionElement, eventName, optionsGroup;
+
+ // Store the old selected event.
+ selected = selectElement.val();
+
+ // Clean up the origin options.
+ selectElement.find('option').remove();
+
+ // Search event properties
+ if (!matchedProps)
+ matchedProps = node.getMatchingProperties(
+ {'type': 'event'}
+ );
+
+ // Added a initial blank option;
+ $('
')
+ .addClass('cm-inactive')
+ .appendTo(selectElement);
+
+ // TODO: Classify the events and use optgroup to
+ // genereate it.
+ /*
+ optionsGroup = $(
+ '
'
+ )
+ .appendTo(selectElement);
+ */
+
+ // Generate event select options.
+ for (eventName in matchedProps) {
+ optionElement = $('