Merge pull request #374 from mcasimir/issue-361

Renamed `ui-state` to `ui-shared-state`
mcasimir · Aug 27, 2016 · d88b577 · d88b577
2 parents 2acbd85 + 0529a76
commit d88b577
Show file tree

Hide file tree

Showing 27 changed files with 201 additions and 114 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,13 +8,15 @@ before_install:
 services:
 - docker
 script:
+- npm run build
 - docker run --rm --privileged -w /usr/src/app -v $PWD:/usr/src/app mcasimir/dind-node-build-runner:6.2.1 bash ci.sh
 - node_modules/.bin/codecov
 deploy:
   provider: npm
   email: [email protected]
   api_key:
     secure: kaKfP4ZS8Bd/XdwJPrCDsllC3SGvMQTdEsC7LriMv5AHCxJFY6rBJ8YqgFx/Tna9TVGjr9Q0lQ6hX1V1im0I8/lT5y5dHW5Kib2WwOosCA530kkkfc/7u4zHIxrl5wzLLp2VQhBaSMherV/btD3cGIPk91M8Q5c2kc0fORx8Cc0=
+  skip_cleanup: true
   on:
     tags: true
     repo: mcasimir/mobile-angular-ui
diff --git a/ROADMAP.tasks b/ROADMAP.tasks
diff --git a/demo/accordion.html b/demo/accordion.html
@@ -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]">

diff --git a/demo/dropdown.html b/demo/dropdown.html
@@ -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)"

diff --git a/demo/modal1.html b/demo/modal1.html
@@ -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">

diff --git a/demo/modal2.html b/demo/modal2.html
@@ -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">

diff --git a/demo/scroll.html b/demo/scroll.html
@@ -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"

diff --git a/demo/tabs.html b/demo/tabs.html
@@ -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}">

diff --git a/demo/toggle.html b/demo/toggle.html
@@ -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">
 
@@ -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>

diff --git a/dist/css/mobile-angular-ui-base.css b/dist/css/mobile-angular-ui-base.css
@@ -8411,7 +8411,7 @@ button.close {
 ng-view,
 ng-include,
 ng-transclude,
-ui-state {
+ui-shared-state {
   display: block;
 }
 

diff --git a/dist/css/mobile-angular-ui-base.min.css b/dist/css/mobile-angular-ui-base.min.css
diff --git a/dist/css/mobile-angular-ui-hover.min.css b/dist/css/mobile-angular-ui-hover.min.css
diff --git a/dist/js/mobile-angular-ui.core.js b/dist/js/mobile-angular-ui.core.js
@@ -1260,7 +1260,7 @@
  *     ui-outer-click-if="Ui.active('myDropdown')"
  *     role="menu"
  *     ui-show="myDropdown"
- *     ui-state="myDropdown"
+ *     ui-shared-state="myDropdown"
  *     ui-turn-off="myDropdown">
  *
  *     <li><a>Action</a></li>
@@ -1408,7 +1408,7 @@
    * Ie.
    *
    * ``` html
-   * <div class="nav nav-tabs" ui-state='activeTab'>
+   * <div class="nav nav-tabs" ui-shared-state='activeTab'>
    *   <a ui-set="{activeTab: 1}">Tab1</a>
    *   <a ui-set="{activeTab: 2}">Tab2</a>
    *   <a ui-set="{activeTab: 3}">Tab3</a>
@@ -1456,7 +1456,7 @@
    * angular.module('myApp', ['mobile-angular-ui.core.sharedState']);
    * ```
    *
-   * Use `ui-state` directive to require/initialize a state from the target element scope
+   * Use `ui-shared-state` directive to require/initialize a state from the target element scope
    *
    * **Example.** Tabs
    *
@@ -1485,7 +1485,7 @@
    * As well as you can use `ui-default` for that:
    *
    * ``` html
-   * <div class="tabs" ui-state="activeTab" ui-default="thisIsAnExpression(5 + 1 - 2)"></div>
+   * <div class="tabs" ui-shared-state="activeTab" ui-default="thisIsAnExpression(5 + 1 - 2)"></div>
    * ```
    *
    */
@@ -1945,11 +1945,39 @@
    * @param {string} uiState The shared state id
    * @param {expression} [uiDefault] the default value
    *
+   * @directive uiSharedState
+   */
+  module.directive('uiSharedState', [
+    'SharedState', function(SharedState) {
+      return {
+        restrict: 'EA',
+        priority: 601, // more than ng-if
+        link: function(scope, elem, attrs) {
+          var id = attrs.uiSharedState || attrs.id;
+          var defaultValueExpr = attrs.uiDefault || attrs.default;
+          var defaultValue = defaultValueExpr ? scope.$eval(defaultValueExpr) : undefined;
+
+          SharedState.initialize(scope, id, {
+            defaultValue: defaultValue,
+            exclusionGroup: attrs.uiExclusionGroup
+          });
+        }
+      };
+    }
+  ]);
+
+  /**
+   * Alias for uiSharedState. **Deprecated** since it clashes with
+   * [UI-Router](https://ui-router.github.io/) `uiState` directive.
+   *
+   * @deprecated
+   * @param {string} uiState The shared state id
+   * @param {expression} [uiDefault] the default value
+   *
    * @directive uiState
    */
   module.directive('uiState', [
-    'SharedState',
-    function(SharedState) {
+    'SharedState', function(SharedState) {
       return {
         restrict: 'EA',
         priority: 601, // more than ng-if

diff --git a/dist/js/mobile-angular-ui.core.min.js b/dist/js/mobile-angular-ui.core.min.js
diff --git a/dist/js/mobile-angular-ui.core.min.js.map b/dist/js/mobile-angular-ui.core.min.js.map
diff --git a/dist/js/mobile-angular-ui.js b/dist/js/mobile-angular-ui.js
@@ -1260,7 +1260,7 @@
  *     ui-outer-click-if="Ui.active('myDropdown')"
  *     role="menu"
  *     ui-show="myDropdown"
- *     ui-state="myDropdown"
+ *     ui-shared-state="myDropdown"
  *     ui-turn-off="myDropdown">
  *
  *     <li><a>Action</a></li>
@@ -1408,7 +1408,7 @@
    * Ie.
    *
    * ``` html
-   * <div class="nav nav-tabs" ui-state='activeTab'>
+   * <div class="nav nav-tabs" ui-shared-state='activeTab'>
    *   <a ui-set="{activeTab: 1}">Tab1</a>
    *   <a ui-set="{activeTab: 2}">Tab2</a>
    *   <a ui-set="{activeTab: 3}">Tab3</a>
@@ -1456,7 +1456,7 @@
    * angular.module('myApp', ['mobile-angular-ui.core.sharedState']);
    * ```
    *
-   * Use `ui-state` directive to require/initialize a state from the target element scope
+   * Use `ui-shared-state` directive to require/initialize a state from the target element scope
    *
    * **Example.** Tabs
    *
@@ -1485,7 +1485,7 @@
    * As well as you can use `ui-default` for that:
    *
    * ``` html
-   * <div class="tabs" ui-state="activeTab" ui-default="thisIsAnExpression(5 + 1 - 2)"></div>
+   * <div class="tabs" ui-shared-state="activeTab" ui-default="thisIsAnExpression(5 + 1 - 2)"></div>
    * ```
    *
    */
@@ -1945,11 +1945,39 @@
    * @param {string} uiState The shared state id
    * @param {expression} [uiDefault] the default value
    *
+   * @directive uiSharedState
+   */
+  module.directive('uiSharedState', [
+    'SharedState', function(SharedState) {
+      return {
+        restrict: 'EA',
+        priority: 601, // more than ng-if
+        link: function(scope, elem, attrs) {
+          var id = attrs.uiSharedState || attrs.id;
+          var defaultValueExpr = attrs.uiDefault || attrs.default;
+          var defaultValue = defaultValueExpr ? scope.$eval(defaultValueExpr) : undefined;
+
+          SharedState.initialize(scope, id, {
+            defaultValue: defaultValue,
+            exclusionGroup: attrs.uiExclusionGroup
+          });
+        }
+      };
+    }
+  ]);
+
+  /**
+   * Alias for uiSharedState. **Deprecated** since it clashes with
+   * [UI-Router](https://ui-router.github.io/) `uiState` directive.
+   *
+   * @deprecated
+   * @param {string} uiState The shared state id
+   * @param {expression} [uiDefault] the default value
+   *
    * @directive uiState
    */
   module.directive('uiState', [
-    'SharedState',
-    function(SharedState) {
+    'SharedState', function(SharedState) {
       return {
         restrict: 'EA',
         priority: 601, // more than ng-if
@@ -2869,7 +2897,7 @@
   /**
    * A directive to create modals and overlays components.
    *
-   * Modals are basically the same of Bootstrap 3 but you have to use uiState
+   * Modals are basically the same of Bootstrap 3 but you have to use uiSharedState
    * with `ngIf/uiIf` or `ngHide/uiHide` to `activate/dismiss` it.
    *
    * By default both modals and overlay are made always showing up by
@@ -2910,7 +2938,7 @@
    *
    * ``` html
    * <div ui-content-for="modals">
-   *   <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">
@@ -2936,7 +2964,7 @@
    *
    * ``` html
    * <div ui-content-for="modals">
-   *   <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">

diff --git a/dist/js/mobile-angular-ui.min.js b/dist/js/mobile-angular-ui.min.js
diff --git a/dist/js/mobile-angular-ui.min.js.map b/dist/js/mobile-angular-ui.min.js.map
diff --git a/examples/lightbulb.html b/examples/lightbulb.html
@@ -25,7 +25,7 @@
         <div class="scrollable-content">
           <div class='section' id='example-html'>
 
-<div ui-state='lightbulb'>
+<div ui-shared-state='lightbulb'>
   <div ui-class="{'text-primary': lightbulb}" 
        class="text-default">
     <i class="fa fa-lightbulb-o"></i>

diff --git a/examples/tabs.html b/examples/tabs.html
@@ -18,7 +18,7 @@
       <div class="scrollable">
         <div class="scrollable-content">
           <div class='section' id='example-html'>
-<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}">