Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

AUI-1104 Grunt format #1

Closed
wants to merge 58 commits into from
Closed

AUI-1104 Grunt format #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
de7acb9
AUI-1191 Browser redirects page when trying to delete the selected co…
Mar 24, 2014
696b402
AUI-1191 Adding tests
Mar 24, 2014
ee3b789
AUI-1202 Typo API Docs from Toggler Delegate
Mar 27, 2014
707de83
AUI-1202 Add missing API Docs markup
Mar 27, 2014
16d38e3
AUI-1203 Moving a node in the diagram builder changes the scrollbar o…
Mar 28, 2014
6a6b121
AUI-1195 aui-datatable-edit - option can not be added
Mar 25, 2014
a889879
AUI-1211 Fix Y.Button duplicated icon due labelHTML added by YUI 3.15.0
eduardolundgren Apr 2, 2014
ad66965
AUI-1217 Update YUI3 to v3.16.0-rc1 (Fixes AUI-1218)
Apr 4, 2014
b756438
AUI-1212 Typo on console.time message
brunocoelho Apr 4, 2014
217d5f3
AUI-1227 Typo on AUI Widget Toggle module
brunocoelho Apr 4, 2014
50efdaf
AUI-1237 The value of cssClass attribute always comes from the config…
Apr 7, 2014
91d46c0
AUI-1194 select option with empty option-text or value can not be cre…
Mar 25, 2014
e84da64
AUI-1194 Allow empty values in BaseOptionsCellEditor
Apr 2, 2014
fdad463
AUI-1194 Adding tests
Apr 2, 2014
0faa698
AUI-1204 adding html-select for form-validator demo to test required …
Mar 28, 2014
53d39b1
AUI-1204 Source formatting
Apr 2, 2014
2399092
AUI-1204 Adding tests
Apr 2, 2014
b061ea9
AUI-1178 Enable use a function as value to position of Widget-Positio…
Mar 13, 2014
792ad8b
AUI-1178 SF
eduardolundgren Apr 7, 2014
87f4bc0
grunt format
eduardolundgren Apr 7, 2014
3b7b826
AUI-1192 Insert pauseOnHover attribute on Carousel
Mar 25, 2014
456444f
AUI-1192 Source formatting
Mar 27, 2014
a0995c1
AUI-1192 Source formatting
eduardolundgren Apr 7, 2014
59a82c0
AUI-1217 Fix misterious yui branch
jbalsas Apr 8, 2014
8c14d95
AUI-1217 Fix aui-event-input condition for new Loader
jbalsas Apr 8, 2014
dc4e8ae
AUI-1217 Bring back conditions for aui-event-delegate-change and aui-…
jbalsas Apr 8, 2014
0d0ed1b
AUI-1217 Simplify aui-base-html5-shiv trigger
jbalsas Apr 8, 2014
3423fd5
AUI-1250 The rating display is not correct with floats.
Apr 9, 2014
09eca1a
AUI-1250 Update rating demo
lipusz Apr 10, 2014
23f13fc
AUI-1250 - Source formatting
natecavanaugh Apr 10, 2014
8ecbd3e
AUI-1158 - AUI Diagram Builder connections jump if diagram area is sc…
drewbrokke Mar 6, 2014
1432ad8
AUI-1158 - Adding test
Apr 9, 2014
fccf4b8
AUI-1158 - Source formatting
Apr 12, 2014
ccf41b1
AUI-1264 - Add skip to first and last page
pat270 Apr 14, 2014
3db60bc
AUI-1264 - Update History
pat270 Apr 14, 2014
30ec805
AUI-1264 - Test skip to first and last page
pat270 Apr 14, 2014
fe259c3
AUI-1264 - Source formatting
Apr 16, 2014
52d62a2
AUI-1177 Date disappears from input textbox when choosing the minimum…
mairatma Mar 25, 2014
66f7f20
grunt format
eduardolundgren Apr 16, 2014
aa337f9
Yogi loader regenerate
eduardolundgren Apr 16, 2014
2a1a5f7
AUI-1208 Cloned fields displaying hidden attributes
mairatma Mar 31, 2014
d915515
AUI-1208 Source formatting
eduardolundgren Apr 16, 2014
ca66554
AUI-1271 Update YUI3 to v3.16.0
eduardolundgren Apr 16, 2014
23d9c5c
Release 2.5.0
eduardolundgren Apr 16, 2014
504be63
Merge branch 'master' into pull-request-263-AUI-1158
natecavanaugh Apr 16, 2014
1d6249d
Merge branch 'master' into pull-request-265-AUI-1264
natecavanaugh Apr 16, 2014
a1af1e5
Revert "AUI-1264 - Source formatting"
eduardolundgren Apr 17, 2014
a7755e8
Revert "AUI-1264 - Test skip to first and last page"
eduardolundgren Apr 17, 2014
135e17c
Revert "AUI-1264 - Update History"
eduardolundgren Apr 17, 2014
d101a15
Revert "AUI-1264 - Add skip to first and last page"
eduardolundgren Apr 17, 2014
d05d3df
AUI-1104 Add Undo/Redo module
mairatma Apr 1, 2014
b082819
AUI-1104 Renaming 'action' to 'state'
mairatma Apr 16, 2014
8058a28
AUI-1104 Adding a test utils file for Undo/Redo module
mairatma Apr 16, 2014
df78614
AUI-1104 UndoRedo should handle async actions.
mairatma Apr 15, 2014
06c69b1
AUI-1104 Extending Undo/Redo module with a few useful functions
mairatma Apr 15, 2014
79bd444
AUI-1104 Adding max undo depth to the Undo/Redo module
mairatma Apr 15, 2014
864d16d
AUI-1104 Source formatting
eduardolundgren Apr 17, 2014
a5ee702
AUI-1104 Grunt format
eduardolundgren Apr 17, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions .alloy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"yui3": {
"folder": "../yui3",
"repo": "https://github.com/liferay/yui3.git",
"version": "patched-v3.15.0"
"version": "patched-v3.16.0"
},
"alloy-bootstrap": {
"folder": "../alloy-bootstrap",
Expand All @@ -28,6 +28,6 @@
"version": "master"
}
},
"yuiversion": "patched-v3.15.0",
"version": "2.0.0"
"yuiversion": "patched-v3.16.0",
"version": "2.5.0"
}
1 change: 1 addition & 0 deletions demos/carousel/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ <h1>AlloyUI - Carousel</h1>
contentBox: '#demo',
activeIndex: 0,
height: 254,
pauseOnHover: true,
width: 940
}).render();

Expand Down
10 changes: 10 additions & 0 deletions demos/form-validator/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,16 @@ <h2>Rules extracted from HTML markup</h2>
<input name="email1" id="email1" class="field-email" type="text">
</div>
</div>
<div class="control-group">
<label class="control-label" for="select1">Gender (required)</label>
<div class="controls">
<select name="select1" id="select1" class="field-required field-select">
<option value="male">Male</option>
<option value="female">Female</option>
<option value=""></option>
</select>
</div>
</div>
<input type="submit">
</form>
<h2>Rules passed from JavaScript</h2>
Expand Down
4 changes: 2 additions & 2 deletions demos/modal/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ <h1>AlloyUI - Modal</h1>
<script>
YUI({ filter:'raw' }).use('aui-modal', 'resize-proxy', function(Y) {

console.time('How long does it takes?');
console.time('How long does it take?');

var modal = new Y.Modal({
bodyContent: 'One fine body…',
Expand Down Expand Up @@ -61,7 +61,7 @@ <h1>AlloyUI - Modal</h1>
}
]);

console.timeEnd('How long does it takes?');
console.timeEnd('How long does it take?');

});
</script>
Expand Down
6 changes: 4 additions & 2 deletions demos/popover/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,10 @@ <h1>AlloyUI - Popover</h1>
delay: 500, // in milliseconds
duration: 0.5, // in seconds
headerContent: 'Header content',
trigger: '#triggerTop'

trigger: '#triggerTop',
position: function() {
return 'top';
}
}).render();

var popoverBottom = new Y.Popover({
Expand Down
4 changes: 2 additions & 2 deletions demos/tabview/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ <h2>List</h2>
<script>
YUI({ filter:'raw' }).use('aui-tabview', function(Y) {

console.time('How long does it takes?');
console.time('How long does it take?');

new Y.TabView({
srcNode: '#markup'
Expand Down Expand Up @@ -141,7 +141,7 @@ <h2>List</h2>
type: 'list'
}).render();

console.timeEnd('How long does it takes?');
console.timeEnd('How long does it take?');

});
</script>
Expand Down
4 changes: 2 additions & 2 deletions demos/toolbar/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ <h2>From JavaScript</h2>
<script>
YUI({ filter: 'raw' }).use('aui-toolbar', function(Y) {

console.time('How long does it takes?');
console.time('How long does it take?');

new Y.Toolbar({
boundingBox: '#toolbar1',
Expand Down Expand Up @@ -203,7 +203,7 @@ <h2>From JavaScript</h2>
]
}).render();

console.timeEnd('How long does it takes?');
console.timeEnd('How long does it take?');

});
</script>
Expand Down
101 changes: 101 additions & 0 deletions demos/undo-redo/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title></title>
<link rel="stylesheet" href="../../build/aui-css/css/bootstrap.css">
<script src="../../build/aui/aui.js"></script>
<style>
body {
margin-left: 10px;
}
#buttons-container {
margin-bottom: 10px;
}
#redbox-container {
border: 1px solid black;
height: 300px;
width: 500px;
}
#redbox {
background-color: red;
height: 100px;
width: 100px;
}
.hidden {
display: none;
}
</style>
</head>
<body class="yui3-skin-sam">
<h1>AlloyUI - UndoRedo</h1>
<div id="buttons-container">
<span class="btn btn-primary sync-button">Run Async Example</span>
<span class="btn undo-button">Undo</span>
<span class="btn redo-button">Redo</span>
<span class="loading-indicator hidden">Running...</span>
</div>
<div id="redbox-container">
<div id="redbox"></div>
</div>

<script>

YUI({filter: 'raw'}).use('aui-undo-redo', 'dd-drag', 'dd-constrain', function(Y) {
var box = Y.one('#redbox'),
dd = new Y.DD.Drag({node: '#redbox'}),
undoRedo = new Y.UndoRedo(),
previousXY = box.getXY(),
async = false;

dd.plug(Y.Plugin.DDConstrained, {constrain2node: '#redbox-container'});
dd.on('drag:end', function(event) {
var undoXY = previousXY,
redoXY = box.getXY();

undoRedo.add({
undo: function() {
return async ? boxSetXYPromise(undoXY) : boxSetXY(undoXY);
},
redo: function() {
return async ? boxSetXYPromise(redoXY) : boxSetXY(redoXY);
}
});

previousXY = redoXY;
});

Y.one('.undo-button').on('click', function() {
undoRedo.undo();
});
Y.one('.redo-button').on('click', function() {
undoRedo.redo();
});
Y.one('.sync-button').on('click', function() {
if (async) {
this.set('text', 'Run Async Example');
} else {
this.set('text', 'Run Sync Example');
}
async = !async;
});

function boxSetXY(xy) {
box.setXY(xy);
previousXY = xy;
}

function boxSetXYPromise(xy) {
return new Y.Promise(function(resolve) {
Y.one('.loading-indicator').removeClass('hidden');
setTimeout(function() {
boxSetXY(xy);
resolve();
Y.one('.loading-indicator').addClass('hidden');
}, 1000);
});
}
});
</script>
</body>
</html>
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "alloy",
"description": "AlloyUI",
"version": "2.0.0",
"version": "2.5.0",
"author": {
"name": "Eduardo Lundgren",
"email": "eduardo.lundgren@liferay.com",
Expand Down
2 changes: 1 addition & 1 deletion src/aui-base/js/aui-aliases.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Y.mix(YUI.Env.aliases, {
"aui-collection": ["aui-map","aui-set","aui-linkedset"],
"aui-datatable": ["aui-datatable-edit","aui-datatable-highlight","aui-datatable-selection","aui-datatable-property-list"],
"aui-diagram-builder": ["aui-diagram-builder-base","aui-diagram-builder-connector","aui-diagram-builder-impl"],
"aui-event": ["aui-event-base","aui-event-delegate-change","aui-event-delegate-submit"],
"aui-event": ["aui-event-base"],
"aui-form-builder": ["aui-form-builder-base","aui-form-builder-field-base","aui-form-builder-field-button","aui-form-builder-field-checkbox","aui-form-builder-field-fieldset","aui-form-builder-field-file-upload","aui-form-builder-field-multiple-choice","aui-form-builder-field-radio","aui-form-builder-field-select","aui-form-builder-field-text","aui-form-builder-field-textarea"],
"aui-image-viewer": ["aui-image-viewer-base","aui-image-viewer-gallery","aui-image-viewer-media"],
"aui-io": ["aui-io-request"],
Expand Down
27 changes: 21 additions & 6 deletions src/aui-base/js/aui-loader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ Y.mix(YUI.Env[Y.version].modules, {
"aui-base-html5-shiv": {
"condition": {
"name": "aui-base-html5-shiv",
"trigger": "aui-base",
"trigger": "node-base",
"ua": "ie"
}
},
Expand Down Expand Up @@ -332,9 +332,7 @@ Y.mix(YUI.Env[Y.version].modules, {
},
"aui-event": {
"use": [
"aui-event-base",
"aui-event-delegate-change",
"aui-event-delegate-submit"
"aui-event-base"
]
},
"aui-event-base": {
Expand All @@ -343,13 +341,23 @@ Y.mix(YUI.Env[Y.version].modules, {
]
},
"aui-event-delegate-change": {
"condition": {
"name": "aui-event-delegate-change",
"trigger": "event-base-ie",
"ua": "ie"
},
"requires": [
"aui-event-base",
"event-delegate",
"event-synthetic"
]
},
"aui-event-delegate-submit": {
"condition": {
"name": "aui-event-delegate-submit",
"trigger": "event-base-ie",
"ua": "ie"
},
"requires": [
"aui-event-base",
"event-delegate",
Expand All @@ -374,7 +382,7 @@ Y.mix(YUI.Env[Y.version].modules, {

return !testFeature('event', 'input');
},
"trigger": "aui-event"
"trigger": "aui-event-base"
},
"requires": [
"aui-event-base",
Expand Down Expand Up @@ -982,6 +990,13 @@ Y.mix(YUI.Env[Y.version].modules, {
],
"skinnable": true
},
"aui-undo-redo": {
"requires": [
"base",
"base-build",
"promise"
]
},
"aui-url": {
"requires": [
"oop",
Expand Down Expand Up @@ -1044,4 +1059,4 @@ Y.mix(YUI.Env[Y.version].modules, {
]
}
});
YUI.Env[Y.version].md5 = '8d2112cfec7c545d4f53ed15310ca2ed';
YUI.Env[Y.version].md5 = 'fc5624680280a730c0ddde58f4e4dc07';
25 changes: 20 additions & 5 deletions src/aui-base/js/aui-loader.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
"aui-base-html5-shiv": {
"condition": {
"name": "aui-base-html5-shiv",
"trigger": "aui-base",
"trigger": "node-base",
"ua": "ie"
}
},
Expand Down Expand Up @@ -322,9 +322,7 @@
},
"aui-event": {
"use": [
"aui-event-base",
"aui-event-delegate-change",
"aui-event-delegate-submit"
"aui-event-base"
]
},
"aui-event-base": {
Expand All @@ -333,13 +331,23 @@
]
},
"aui-event-delegate-change": {
"condition": {
"name": "aui-event-delegate-change",
"trigger": "event-base-ie",
"ua": "ie"
},
"requires": [
"aui-event-base",
"event-delegate",
"event-synthetic"
]
},
"aui-event-delegate-submit": {
"condition": {
"name": "aui-event-delegate-submit",
"trigger": "event-base-ie",
"ua": "ie"
},
"requires": [
"aui-event-base",
"event-delegate",
Expand All @@ -350,7 +358,7 @@
"condition": {
"name": "aui-event-input",
"test": "aui-event-input-test.js",
"trigger": "aui-event"
"trigger": "aui-event-base"
},
"requires": [
"aui-event-base",
Expand Down Expand Up @@ -958,6 +966,13 @@
],
"skinnable": true
},
"aui-undo-redo": {
"requires": [
"base",
"base-build",
"promise"
]
},
"aui-url": {
"requires": [
"oop",
Expand Down
2 changes: 1 addition & 1 deletion src/aui-base/meta/aui-base.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"aui-base-html5-shiv": {
"condition": {
"name": "aui-base-html5-shiv",
"trigger": "aui-base",
"trigger": "node-base",
"ua": "ie"
}
},
Expand Down