Skip to content

Commit

Permalink
Merge branch 'master' of github.com:liferay/alloy-ui
Browse files Browse the repository at this point in the history
  • Loading branch information
@natecavanaugh
natecavanaugh committed Aug 25, 2011
2 parents 1506d3f + be6430d commit dc3c9e2
Show file tree
Hide file tree
Showing 65 changed files with 86 additions and 86 deletions.
2 changes: 1 addition & 1 deletion build/aui-diagram-builder/aui-diagram-builder-debug.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1044,7 +1044,7 @@ var DiagramBuilder = A.Component.create({
field.destroy();
});

fields = null;
fields = instance.editingConnector = instance.editingNode = instance.selectedNode = null;
},

closeEditProperties: function() {
Expand Down
2 changes: 1 addition & 1 deletion build/aui-diagram-builder/aui-diagram-builder-impl-debug.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ var DiagramBuilder = A.Component.create({
field.destroy();
});

fields = null;
fields = instance.editingConnector = instance.editingNode = instance.selectedNode = null;
},

closeEditProperties: function() {
Expand Down
6 changes: 3 additions & 3 deletions build/aui-diagram-builder/aui-diagram-builder-impl-min.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/aui-diagram-builder/aui-diagram-builder-impl.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ var DiagramBuilder = A.Component.create({
field.destroy();
});

fields = null;
fields = instance.editingConnector = instance.editingNode = instance.selectedNode = null;
},

closeEditProperties: function() {
Expand Down
2 changes: 1 addition & 1 deletion build/aui-diagram-builder/aui-diagram-builder-min.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/aui-diagram-builder/aui-diagram-builder.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1044,7 +1044,7 @@ var DiagramBuilder = A.Component.create({
field.destroy();
});

fields = null;
fields = instance.editingConnector = instance.editingNode = instance.selectedNode = null;
},

closeEditProperties: function() {
Expand Down
6 changes: 3 additions & 3 deletions build/aui-tpl-snippets/aui-tpl-snippets-base-debug.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ var Lang = A.Lang,

A.TplSnippets = {
getClassName: function(auiCssClass, cssClass) {
var prefix = STR_SPACE + A.getClassName(STR_SPACE);
var prefix = STR_SPACE + A.getClassName(STR_BLANK);

return AArray(cssClass).join(STR_SPACE) + (auiCssClass ? (prefix + AArray(auiCssClass).join(prefix)) : STR_SPACE);
return AArray(cssClass).join(STR_SPACE) + (auiCssClass ? (prefix + AArray(auiCssClass).join(prefix)) : STR_BLANK);
}
};

}, '@VERSION@' ,{requires:['aui-template'], skinnable:false});
}, '@VERSION@' ,{skinnable:false, requires:['aui-template']});
2 changes: 1 addition & 1 deletion build/aui-tpl-snippets/aui-tpl-snippets-base-min.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions build/aui-tpl-snippets/aui-tpl-snippets-base.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ var Lang = A.Lang,

A.TplSnippets = {
getClassName: function(auiCssClass, cssClass) {
var prefix = STR_SPACE + A.getClassName(STR_SPACE);
var prefix = STR_SPACE + A.getClassName(STR_BLANK);

return AArray(cssClass).join(STR_SPACE) + (auiCssClass ? (prefix + AArray(auiCssClass).join(prefix)) : STR_SPACE);
return AArray(cssClass).join(STR_SPACE) + (auiCssClass ? (prefix + AArray(auiCssClass).join(prefix)) : STR_BLANK);
}
};

}, '@VERSION@' ,{requires:['aui-template'], skinnable:false});
}, '@VERSION@' ,{skinnable:false, requires:['aui-template']});
2 changes: 1 addition & 1 deletion build/aui-tpl-snippets/aui-tpl-snippets-checkbox-debug.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ A.Template.register(
]
);

}, '@VERSION@' ,{requires:['aui-tpl-snippets-base'], skinnable:false});
}, '@VERSION@' ,{skinnable:false, requires:['aui-tpl-snippets-base']});
2 changes: 1 addition & 1 deletion build/aui-tpl-snippets/aui-tpl-snippets-checkbox-min.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion build/aui-tpl-snippets/aui-tpl-snippets-checkbox.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ A.Template.register(
]
);

}, '@VERSION@' ,{requires:['aui-tpl-snippets-base'], skinnable:false});
}, '@VERSION@' ,{skinnable:false, requires:['aui-tpl-snippets-base']});
16 changes: 8 additions & 8 deletions build/aui-tpl-snippets/aui-tpl-snippets-debug.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ var Lang = A.Lang,

A.TplSnippets = {
getClassName: function(auiCssClass, cssClass) {
var prefix = STR_SPACE + A.getClassName(STR_SPACE);
var prefix = STR_SPACE + A.getClassName(STR_BLANK);

return AArray(cssClass).join(STR_SPACE) + (auiCssClass ? (prefix + AArray(auiCssClass).join(prefix)) : STR_SPACE);
return AArray(cssClass).join(STR_SPACE) + (auiCssClass ? (prefix + AArray(auiCssClass).join(prefix)) : STR_BLANK);
}
};

}, '@VERSION@' ,{requires:['aui-template'], skinnable:false});
}, '@VERSION@' ,{skinnable:false, requires:['aui-template']});
AUI.add('aui-tpl-snippets-select', function(A) {
A.Template.register(
'select',
Expand All @@ -30,7 +30,7 @@ A.Template.register(
]
);

}, '@VERSION@' ,{requires:['aui-tpl-snippets-base'], skinnable:false});
}, '@VERSION@' ,{skinnable:false, requires:['aui-tpl-snippets-base']});
AUI.add('aui-tpl-snippets-input', function(A) {
A.Template.register(
'input',
Expand All @@ -42,7 +42,7 @@ A.Template.register(
]
);

}, '@VERSION@' ,{requires:['aui-tpl-snippets-base'], skinnable:false});
}, '@VERSION@' ,{skinnable:false, requires:['aui-tpl-snippets-base']});
AUI.add('aui-tpl-snippets-textarea', function(A) {
A.Template.register(
'textarea',
Expand All @@ -54,7 +54,7 @@ A.Template.register(
]
);

}, '@VERSION@' ,{requires:['aui-tpl-snippets-base'], skinnable:false});
}, '@VERSION@' ,{skinnable:false, requires:['aui-tpl-snippets-base']});
AUI.add('aui-tpl-snippets-checkbox', function(A) {
A.Template.register(
'checkbox',
Expand All @@ -66,8 +66,8 @@ A.Template.register(
]
);

}, '@VERSION@' ,{requires:['aui-tpl-snippets-base'], skinnable:false});
}, '@VERSION@' ,{skinnable:false, requires:['aui-tpl-snippets-base']});


AUI.add('aui-tpl-snippets', function(A){}, '@VERSION@' ,{skinnable:false, use:['aui-tpl-snippets-base','aui-tpl-snippets-select','aui-tpl-snippets-input','aui-tpl-snippets-textarea','aui-tpl-snippets-checkbox']});
AUI.add('aui-tpl-snippets', function(A){}, '@VERSION@' ,{use:['aui-tpl-snippets-base','aui-tpl-snippets-select','aui-tpl-snippets-input','aui-tpl-snippets-textarea','aui-tpl-snippets-checkbox'], skinnable:false});

2 changes: 1 addition & 1 deletion build/aui-tpl-snippets/aui-tpl-snippets-input-debug.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ A.Template.register(
]
);

}, '@VERSION@' ,{requires:['aui-tpl-snippets-base'], skinnable:false});
}, '@VERSION@' ,{skinnable:false, requires:['aui-tpl-snippets-base']});
2 changes: 1 addition & 1 deletion build/aui-tpl-snippets/aui-tpl-snippets-input-min.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion build/aui-tpl-snippets/aui-tpl-snippets-input.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ A.Template.register(
]
);

}, '@VERSION@' ,{requires:['aui-tpl-snippets-base'], skinnable:false});
}, '@VERSION@' ,{skinnable:false, requires:['aui-tpl-snippets-base']});
2 changes: 1 addition & 1 deletion build/aui-tpl-snippets/aui-tpl-snippets-min.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion build/aui-tpl-snippets/aui-tpl-snippets-select-debug.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ A.Template.register(
]
);

}, '@VERSION@' ,{requires:['aui-tpl-snippets-base'], skinnable:false});
}, '@VERSION@' ,{skinnable:false, requires:['aui-tpl-snippets-base']});
2 changes: 1 addition & 1 deletion build/aui-tpl-snippets/aui-tpl-snippets-select-min.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion build/aui-tpl-snippets/aui-tpl-snippets-select.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ A.Template.register(
]
);

}, '@VERSION@' ,{requires:['aui-tpl-snippets-base'], skinnable:false});
}, '@VERSION@' ,{skinnable:false, requires:['aui-tpl-snippets-base']});
2 changes: 1 addition & 1 deletion build/aui-tpl-snippets/aui-tpl-snippets-textarea-debug.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ A.Template.register(
]
);

}, '@VERSION@' ,{requires:['aui-tpl-snippets-base'], skinnable:false});
}, '@VERSION@' ,{skinnable:false, requires:['aui-tpl-snippets-base']});
2 changes: 1 addition & 1 deletion build/aui-tpl-snippets/aui-tpl-snippets-textarea-min.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion build/aui-tpl-snippets/aui-tpl-snippets-textarea.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ A.Template.register(
]
);

}, '@VERSION@' ,{requires:['aui-tpl-snippets-base'], skinnable:false});
}, '@VERSION@' ,{skinnable:false, requires:['aui-tpl-snippets-base']});
16 changes: 8 additions & 8 deletions build/aui-tpl-snippets/aui-tpl-snippets.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ var Lang = A.Lang,

A.TplSnippets = {
getClassName: function(auiCssClass, cssClass) {
var prefix = STR_SPACE + A.getClassName(STR_SPACE);
var prefix = STR_SPACE + A.getClassName(STR_BLANK);

return AArray(cssClass).join(STR_SPACE) + (auiCssClass ? (prefix + AArray(auiCssClass).join(prefix)) : STR_SPACE);
return AArray(cssClass).join(STR_SPACE) + (auiCssClass ? (prefix + AArray(auiCssClass).join(prefix)) : STR_BLANK);
}
};

}, '@VERSION@' ,{requires:['aui-template'], skinnable:false});
}, '@VERSION@' ,{skinnable:false, requires:['aui-template']});
AUI.add('aui-tpl-snippets-select', function(A) {
A.Template.register(
'select',
Expand All @@ -30,7 +30,7 @@ A.Template.register(
]
);

}, '@VERSION@' ,{requires:['aui-tpl-snippets-base'], skinnable:false});
}, '@VERSION@' ,{skinnable:false, requires:['aui-tpl-snippets-base']});
AUI.add('aui-tpl-snippets-input', function(A) {
A.Template.register(
'input',
Expand All @@ -42,7 +42,7 @@ A.Template.register(
]
);

}, '@VERSION@' ,{requires:['aui-tpl-snippets-base'], skinnable:false});
}, '@VERSION@' ,{skinnable:false, requires:['aui-tpl-snippets-base']});
AUI.add('aui-tpl-snippets-textarea', function(A) {
A.Template.register(
'textarea',
Expand All @@ -54,7 +54,7 @@ A.Template.register(
]
);

}, '@VERSION@' ,{requires:['aui-tpl-snippets-base'], skinnable:false});
}, '@VERSION@' ,{skinnable:false, requires:['aui-tpl-snippets-base']});
AUI.add('aui-tpl-snippets-checkbox', function(A) {
A.Template.register(
'checkbox',
Expand All @@ -66,8 +66,8 @@ A.Template.register(
]
);

}, '@VERSION@' ,{requires:['aui-tpl-snippets-base'], skinnable:false});
}, '@VERSION@' ,{skinnable:false, requires:['aui-tpl-snippets-base']});


AUI.add('aui-tpl-snippets', function(A){}, '@VERSION@' ,{skinnable:false, use:['aui-tpl-snippets-base','aui-tpl-snippets-select','aui-tpl-snippets-input','aui-tpl-snippets-textarea','aui-tpl-snippets-checkbox']});
AUI.add('aui-tpl-snippets', function(A){}, '@VERSION@' ,{use:['aui-tpl-snippets-base','aui-tpl-snippets-select','aui-tpl-snippets-input','aui-tpl-snippets-textarea','aui-tpl-snippets-checkbox'], skinnable:false});

2 changes: 1 addition & 1 deletion demos/diagram-builder/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
z-index: 1;
}

.auicelleditor {
.aui-basecelleditor {
z-index: 1000 !important;
}

Expand Down
2 changes: 1 addition & 1 deletion sandbox/taglibs/alloy-taglib/src/com/liferay/alloy/tools/tagbuilder/templates/init_jsp.ftl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ _updateOptions(_options, "${attribute.getSafeName()}", ${attribute.getSafeName()
</#list>
%>

<%@ include file="init-ext.jspf" %>
<%@ include file="${jspRelativePath}/init-ext.jspf" %>

<%!
private static final String _NAMESPACE = "${namespace}";
Expand Down
2 changes: 1 addition & 1 deletion sandbox/taglibs/alloy-web/docroot/html/taglib/alloy/a_io/init.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ if ((dynamicAttributes != null) && !dynamicAttributes.isEmpty()) {
%>

<%@ include file="init-ext.jspf" %>
<%@ include file="/html/taglib/alloy/a_io/init-ext.jspf" %>

<%!
private static final String _NAMESPACE = "alloy:a-io:";
Expand Down
2 changes: 1 addition & 1 deletion sandbox/taglibs/alloy-web/docroot/html/taglib/alloy/auto_complete/init.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@ _updateOptions(_options, "onRender", onRender);
_updateOptions(_options, "onWidthChange", onWidthChange);
%>

<%@ include file="init-ext.jspf" %>
<%@ include file="/html/taglib/alloy/auto_complete/init-ext.jspf" %>

<%!
private static final String _NAMESPACE = "alloy:auto-complete:";
Expand Down
Loading

0 comments on commit dc3c9e2

Please sign in to comment.