Skip to content

Commit d88b577

Browse files
authored
Merge pull request #374 from mcasimir/issue-361
Renamed `ui-state` to `ui-shared-state`
2 parents 2acbd85 + 0529a76 commit d88b577

27 files changed

+201
-114
lines changed

.travis.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,15 @@ before_install:
88
services:
99
- docker
1010
script:
11+
- npm run build
1112
- docker run --rm --privileged -w /usr/src/app -v $PWD:/usr/src/app mcasimir/dind-node-build-runner:6.2.1 bash ci.sh
1213
- node_modules/.bin/codecov
1314
deploy:
1415
provider: npm
1516
1617
api_key:
1718
secure: kaKfP4ZS8Bd/XdwJPrCDsllC3SGvMQTdEsC7LriMv5AHCxJFY6rBJ8YqgFx/Tna9TVGjr9Q0lQ6hX1V1im0I8/lT5y5dHW5Kib2WwOosCA530kkkfc/7u4zHIxrl5wzLLp2VQhBaSMherV/btD3cGIPk91M8Q5c2kc0fORx8Cc0=
19+
skip_cleanup: true
1820
on:
1921
tags: true
2022
repo: mcasimir/mobile-angular-ui

ROADMAP.tasks

Lines changed: 0 additions & 64 deletions
This file was deleted.

demo/accordion.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<div class="section">
88
<div class="panel-group"
99

10-
ui-state="myAccordion"
10+
ui-shared-state="myAccordion"
1111
ui-default='2'>
1212

1313
<div class="panel panel-default" ng-repeat="i in [1,2,3]">

demo/dropdown.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<i class="fa fa-ellipsis-v"></i>
1414
</a>
1515
<ul
16-
ui-state="myDropdown{{idx}}"
16+
ui-shared-state="myDropdown{{idx}}"
1717

1818
class="dropdown-menu"
1919
ui-outer-click="Ui.turnOff('myDropdown' + idx)"

demo/modal1.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div class="modal" ui-if="modal1" ui-state="modal1">
1+
<div class="modal" ui-if="modal1" ui-shared-state="modal1">
22
<div class="modal-backdrop in"></div>
33
<div class="modal-dialog">
44
<div class="modal-content">

demo/modal2.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div class="modal modal-overlay" ui-if="modal2" ui-state="modal2">
1+
<div class="modal modal-overlay" ui-if="modal2" ui-shared-state="modal2">
22
<div class="modal-dialog">
33
<div class="modal-content">
44
<div class="modal-header">

demo/scroll.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<span>Scroll</span>
33
</div>
44

5-
<div class="scrollable" ui-state="searchBar">
5+
<div class="scrollable" ui-shared-state="searchBar">
66
<input
77
ng-if="Ui.active('searchBar')"
88
type="search"

demo/tabs.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<div class="scrollable">
66
<div class="scrollable-content">
77
<div class="section">
8-
<ui-state id="activeTab" default="1"></ui-state>
8+
<ui-shared-state id="activeTab" default="1"></ui-shared-state>
99

1010
<ul class="nav nav-tabs">
1111
<li ui-class="{'active': activeTab == 1}">

demo/toggle.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<div class="scrollable-content">
77
<div class="container-fluid section section-break" id="toggleExample">
88

9-
<p ui-state id="lightbulb"
9+
<p ui-shared-state id="lightbulb"
1010
ui-class="{'text-primary': lightbulb}"
1111
class="text-default">
1212

@@ -39,9 +39,9 @@
3939
<h5>ExclusionGroup example</h5>
4040

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

4747
</div>

dist/css/mobile-angular-ui-base.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8411,7 +8411,7 @@ button.close {
84118411
ng-view,
84128412
ng-include,
84138413
ng-transclude,
8414-
ui-state {
8414+
ui-shared-state {
84158415
display: block;
84168416
}
84178417

0 commit comments

Comments
 (0)