Skip to content

Commit

Permalink
feat: added ui-shared-state and **deprecated** ui-state so it doe…
Browse files Browse the repository at this point in the history
…s not clash with ui-router
  • Loading branch information
Maurizio Casimirri committed Aug 26, 2016
1 parent 2acbd85 commit 9ad2f57
Show file tree
Hide file tree
Showing 33 changed files with 90 additions and 9,342 deletions.
64 changes: 0 additions & 64 deletions ROADMAP.tasks

This file was deleted.

2 changes: 1 addition & 1 deletion demo/accordion.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<div class="section">
<div class="panel-group"

ui-state="myAccordion"
ui-shared-state="myAccordion"
ui-default='2'>

<div class="panel panel-default" ng-repeat="i in [1,2,3]">
Expand Down
2 changes: 1 addition & 1 deletion demo/dropdown.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<i class="fa fa-ellipsis-v"></i>
</a>
<ul
ui-state="myDropdown{{idx}}"
ui-shared-state="myDropdown{{idx}}"

class="dropdown-menu"
ui-outer-click="Ui.turnOff('myDropdown' + idx)"
Expand Down
2 changes: 1 addition & 1 deletion demo/modal1.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="modal" ui-if="modal1" ui-state="modal1">
<div class="modal" ui-if="modal1" ui-shared-state="modal1">
<div class="modal-backdrop in"></div>
<div class="modal-dialog">
<div class="modal-content">
Expand Down
2 changes: 1 addition & 1 deletion demo/modal2.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="modal modal-overlay" ui-if="modal2" ui-state="modal2">
<div class="modal modal-overlay" ui-if="modal2" ui-shared-state="modal2">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
Expand Down
2 changes: 1 addition & 1 deletion demo/scroll.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<span>Scroll</span>
</div>

<div class="scrollable" ui-state="searchBar">
<div class="scrollable" ui-shared-state="searchBar">
<input
ng-if="Ui.active('searchBar')"
type="search"
Expand Down
2 changes: 1 addition & 1 deletion demo/tabs.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<div class="scrollable">
<div class="scrollable-content">
<div class="section">
<ui-state id="activeTab" default="1"></ui-state>
<ui-shared-state id="activeTab" default="1"></ui-shared-state>

<ul class="nav nav-tabs">
<li ui-class="{'active': activeTab == 1}">
Expand Down
8 changes: 4 additions & 4 deletions demo/toggle.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<div class="scrollable-content">
<div class="container-fluid section section-break" id="toggleExample">

<p ui-state id="lightbulb"
<p ui-shared-state id="lightbulb"
ui-class="{'text-primary': lightbulb}"
class="text-default">

Expand Down Expand Up @@ -39,9 +39,9 @@
<h5>ExclusionGroup example</h5>

<div class="btn-group">
<a href class="btn btn-default" ui-turn-on="button1" ui-state="button1" ui-class="{'active': button1}" ui-exclusion-group="myButtons">1</a>
<a href class="btn btn-default" ui-turn-on="button2" ui-state="button2" ui-class="{'active': button2}" ui-exclusion-group="myButtons">2</a>
<a href class="btn btn-default" ui-turn-on="button3" ui-state="button3" ui-class="{'active': button3}" ui-exclusion-group="myButtons">3</a>
<a href class="btn btn-default" ui-turn-on="button1" ui-shared-state="button1" ui-class="{'active': button1}" ui-exclusion-group="myButtons">1</a>
<a href class="btn btn-default" ui-turn-on="button2" ui-shared-state="button2" ui-class="{'active': button2}" ui-exclusion-group="myButtons">2</a>
<a href class="btn btn-default" ui-turn-on="button3" ui-shared-state="button3" ui-class="{'active': button3}" ui-exclusion-group="myButtons">3</a>
</div>

</div>
Expand Down
2 changes: 1 addition & 1 deletion dist/css/mobile-angular-ui-base.css
Original file line number Diff line number Diff line change
Expand Up @@ -8411,7 +8411,7 @@ button.close {
ng-view,
ng-include,
ng-transclude,
ui-state {
ui-shared-state {
display: block;
}

Expand Down
8 changes: 0 additions & 8 deletions dist/css/mobile-angular-ui-base.min.css

This file was deleted.

Loading

0 comments on commit 9ad2f57

Please sign in to comment.