diff --git a/.gitmodules b/.gitmodules index 368a9cd..4ee1af8 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,21 @@ [submodule "angular-ui"] path = angular-ui url = git://github.com/angular-ui/angular-ui.git +[submodule "lib/select2"] + path = lib/select2 + url = git://github.com/ivaynberg/select2.git +[submodule "lib/qTip2"] + path = lib/qTip2 + url = git://github.com/Craga89/qTip2.git +[submodule "lib/maskedinput"] + path = lib/maskedinput + url = git://github.com/digitalBush/jquery.maskedinput.git +[submodule "lib/bootstrap"] + path = lib/bootstrap + url = git://github.com/twitter/bootstrap.git +[submodule "lib/tinymce"] + path = lib/tinymce + url = git://github.com/tinymce/tinymce.git +[submodule "lib/CodeMirror2"] + path = lib/CodeMirror2 + url = https://github.com/marijnh/CodeMirror2 diff --git a/angular-ui b/angular-ui index 8689154..87c33b8 160000 --- a/angular-ui +++ b/angular-ui @@ -1 +1 @@ -Subproject commit 8689154fbf56e42c6d1970435cf037f4b5f03635 +Subproject commit 87c33b8537c551a817d9565bc85fcd855f9f4391 diff --git a/index.html b/index.html index 4b893a7..5d7e2d1 100644 --- a/index.html +++ b/index.html @@ -4,25 +4,30 @@ Angular.JS-UI - + + - - - + + + + + - - - - - - - + + + + + + + + +
@@ -149,6 +154,25 @@

How?

+
+
+

CodeMirror

+
+
+
+

What?

+

IDE? In my textareas? Surely you're joking.

+

+
+
+

How?

+
+<textarea ui-codemirror="{theme:'monokai'}" ng-model="codeMirrorModel"></textarea>
+
+
+
+
+

Event Binder

@@ -187,9 +211,9 @@

What?

Calendar picker with ng-model integration

-

Selected Date: {{date}}

-

Formatted Date: {{ date.toLocaleDateString()}}

-

Selected Month: {{date.getMonth()}}

+

Selected Date: {{ date }}

+

Formatted Date: {{ date.toLocaleDateString() }}

+

Selected Month: {{ date.getMonth() }}

@@ -200,9 +224,9 @@

Why?

How?

 <input ng-model="date" ui-date>
-Selected Date: {{date}}
-Formatted Date: {{ date.toLocaleDateString()}}
-Selected Month: {{date.getMonth()}}
+Selected Date: {{ date }}
+Formatted Date: {{ date.toLocaleDateString() }}
+Selected Month: {{ date.getMonth() }}
 <div ng-model="date" ui-date></div>
@@ -217,7 +241,7 @@

Keypress

What?

Bind an event to a particular keypress

-

+

Why?

Cuz you feel like it? Maybe I should stop doing the 'Why' sections, running out of explanations...

@@ -226,11 +250,10 @@

How?

The directive takes a hash (object) with the key code as the key and the callback function to fire as the value. The callback function takes an 'event' param

Note that 13 represents the RETURN key code.

-<textarea ui-keypress="{ 13 : keypressCallback }"></textarea>
+<textarea ui-keypress="{ 13 : 'keypressCallback()' }"></textarea>
 
 <script>
-$scope.keypressCallback = function(e) {
-	e.preventDefault();
+$scope.keypressCallback = function() {
 	alert('Voila!');
 };
 </script>
@@ -245,7 +268,7 @@ 
Mask

 				
 				
What?

 				

-				

+				

 
 				
Why?

 				

@@ -310,7 +333,7 @@ 
How?
-
+

Reset

@@ -318,14 +341,20 @@

Reset

What?

Adds an icon or link that empties the input element

-

+

Why?

Convenience?

How?

- 
<input value="Hover over me" ui-reset>
+
+<input ng-model="resetModel" ui-reset>
+
+<script>
+$scope.resetModal = 'Hover over me';
+</script>
+
@@ -349,7 +378,7 @@

What?

Close ng-model way - Open Modal with ng-model
+ Open Modal with ng-model
Open Modal with data-toggle="modal"

Why?

diff --git a/js/app.js b/js/app.js index 2bec62e..0ea7176 100644 --- a/js/app.js +++ b/js/app.js @@ -3,27 +3,25 @@ * demoApp - 1.0.0rc2 */ -var demoApp = angular.module('demoApp', ['ui'], function($routeProvider) {}).value('ui.config', { +angular.module('demoApp', ['ui'], function($locationProvider) { + $locationProvider.hashPrefix(''); + // Make code pretty + window.prettyPrint && prettyPrint(); +}).value('ui.config', { currency: { - symbol: 'USD$' - } - }); - -demoApp.config(function($locationProvider) { - $locationProvider.hashPrefix(''); - // Make code pretty - window.prettyPrint && prettyPrint() + symbol: 'USD $' + } }); -/** - * Tooltip Demo Controller - */ +function CodeMirrorCtrl($scope) { + $scope.codeMirrorModel = "var helloWorld = 'Success!';"; +} function TooltipCtrl($scope) { - $scope.item = { - title : 'Title', - body : 'Tooltip Body...' - }; + $scope.item = { + title : 'Title', + body : 'Tooltip Body...' + }; }; function EventCtrl($scope) { @@ -33,7 +31,11 @@ function EventCtrl($scope) { }; function ModalCtrl($scope) { - $scope.modalShown = false; + $scope.modalShown = false; +} + +function ResetCtrl($scope) { + $scope.resetModel = 'Hover over me'; } function LengthCtrl($scope) { @@ -47,7 +49,8 @@ function LengthCtrl($scope) { } function KeypressCtrl($scope) { - $scope.keypressCallback = function() { + $scope.keypressCallback = function($event) { + $event.preventDefault(); alert('Voila!'); }; } @@ -58,21 +61,21 @@ function ScrollfixCtrl($scope) { function UniqueCtrl($scope) { $scope.items = [ - { firstName: 'Dean', lastName: 'Sofer', id: 1, gender: 'Male' }, - { firstName: 'Dean', lastName: 'Kuntz', id: 2, gender: 'Male' }, - { firstName: 'Peter', lastName: 'Piper', id: 3, gender: 'Female' }, - { firstName: 'Peter', lastName: 'Darwin', id: 4, gender: 'Male' }, - { firstName: 'Janet', lastName: 'Piper', id: 5, gender: 'Female' }, - { firstName: 'Dan', lastName: 'Doyon', id: 6, gender: 'Male' }, - { firstName: 'Andy', lastName: 'Joslin', id: 1, gender: 'Male' }, + { firstName: 'Dean', lastName: 'Sofer', id: 1, gender: 'Male' }, + { firstName: 'Dean', lastName: 'Kuntz', id: 2, gender: 'Male' }, + { firstName: 'Peter', lastName: 'Piper', id: 3, gender: 'Female' }, + { firstName: 'Peter', lastName: 'Darwin', id: 4, gender: 'Male' }, + { firstName: 'Janet', lastName: 'Piper', id: 5, gender: 'Female' }, + { firstName: 'Dan', lastName: 'Doyon', id: 6, gender: 'Male' }, + { firstName: 'Andy', lastName: 'Joslin', id: 1, gender: 'Male' }, ]; } function CurrencyCtrl($scope) { $scope.nums = { - pos : 1000, - neg : -12345, - zero: 0 + pos : 1000, + neg : -12345, + zero: 0 }; }; /* EOF */ \ No newline at end of file diff --git a/lib/CodeMirror2 b/lib/CodeMirror2 new file mode 160000 index 0000000..e9ae8ac --- /dev/null +++ b/lib/CodeMirror2 @@ -0,0 +1 @@ +Subproject commit e9ae8ac85dc540508c27de6c48b6d77d0d724898 diff --git a/lib/bootstrap b/lib/bootstrap new file mode 160000 index 0000000..857b8fb --- /dev/null +++ b/lib/bootstrap @@ -0,0 +1 @@ +Subproject commit 857b8fb8be81178d14f59c126c1381b09aff7c0f diff --git a/lib/maskedinput b/lib/maskedinput new file mode 160000 index 0000000..0d86254 --- /dev/null +++ b/lib/maskedinput @@ -0,0 +1 @@ +Subproject commit 0d86254e991fce8bb740188b308227a896e0cc70 diff --git a/lib/qTip2 b/lib/qTip2 new file mode 160000 index 0000000..2c87c2e --- /dev/null +++ b/lib/qTip2 @@ -0,0 +1 @@ +Subproject commit 2c87c2e54d732e33e53d0667a5c0c5b08d7e2d79 diff --git a/lib/select2 b/lib/select2 new file mode 160000 index 0000000..482cc40 --- /dev/null +++ b/lib/select2 @@ -0,0 +1 @@ +Subproject commit 482cc409ea27fc3cdf1028e9202c1ca7ada01e35 diff --git a/lib/tinymce b/lib/tinymce new file mode 160000 index 0000000..a0df16e --- /dev/null +++ b/lib/tinymce @@ -0,0 +1 @@ +Subproject commit a0df16e10d6974bddf4566a970b6a88c17937b94