Merge branch 'develop' into staging

sapo · Sep 23, 2014 · 480454d · 480454d
2 parents d085ce8 + d47317d
commit 480454d
Show file tree

Hide file tree

Showing 10 changed files with 7 additions and 15 deletions.
diff --git a/dist/js/ink-all.js b/dist/js/ink-all.js
@@ -13580,8 +13580,6 @@ Ink.createModule('Ink.UI.Carousel', '1',
             }
 
             this._currentPage = page;
-
-            this._updateHider();
         },
 
         /**

diff --git a/dist/js/ink-all.min.js b/dist/js/ink-all.min.js
diff --git a/dist/js/ink-all.min.map b/dist/js/ink-all.min.map
diff --git a/dist/js/ink-ui.js b/dist/js/ink-ui.js
@@ -536,8 +536,6 @@ Ink.createModule('Ink.UI.Carousel', '1',
             }
 
             this._currentPage = page;
-
-            this._updateHider();
         },
 
         /**

diff --git a/dist/js/ink-ui.min.js b/dist/js/ink-ui.min.js
diff --git a/dist/js/ink-ui.min.map b/dist/js/ink-ui.min.map
diff --git a/dist/js/ink.carousel.js b/dist/js/ink.carousel.js
@@ -368,8 +368,6 @@ Ink.createModule('Ink.UI.Carousel', '1',
             }
 
             this._currentPage = page;
-
-            this._updateHider();
         },
 
         /**

diff --git a/src/js/Ink/UI/Carousel/1/lib.js b/src/js/Ink/UI/Carousel/1/lib.js
@@ -368,8 +368,6 @@ Ink.createModule('Ink.UI.Carousel', '1',
             }
 
             this._currentPage = page;
-
-            this._updateHider();
         },
 
         /**

diff --git a/test/unit/Ink.UI.Tabs_1/test.js b/test/unit/Ink.UI.Tabs_1/test.js
@@ -42,7 +42,7 @@ Ink.requireModules(['Ink.UI.Tabs_1', 'Ink.UI.Common_1', 'Ink.Dom.Element_1', 'In
         tabComponent._changeTab(Ink.s('a', changeTo));
 
         ok(changeTo.className.match(/active/), 'tab has .active class!');
-        strictEqual(tabComponent.activeMenuTab(), changeTo, 'tab is active!');
+        strictEqual(tabComponent._activeMenuTab, changeTo, 'tab is active!');
 
         var activeTabs = Ink.ss('.tabs-nav .active', container);
         equal(activeTabs.length, 1, 'only ever one active tab');

diff --git a/test/unit/Ink.Util.I18n_1/Ink.Util.I18n_1.js b/test/unit/Ink.Util.I18n_1/Ink.Util.I18n_1.js
@@ -282,12 +282,12 @@ Ink.requireModules( [ 'Ink.Util.I18n' ] , function ( I18n ) {
     });
 
     test('Global stuff', function () {
-        I18n.lang('en_US')
+        I18n.langGlobal('en_US')
         equal(new I18n({}).lang(), 'en_US');
 
         var inst = new I18n({}, 'pt_PT');
 
-        I18n.append({
+        I18n.appendGlobal({
             pt_PT: {
                 hello: 'olá'
             },
-Original file line number
+Diff line change
@@ Expand Up / @@ -13580,8 +13580,6 @@ Ink.createModule('Ink.UI.Carousel', '1', @@
                 }
                 this._currentPage = page;
-                this._updateHider();
             },
             /**
@@ Expand Down @@