From 7704a00d7b13c81811f9d6b77507da1b3c76133f Mon Sep 17 00:00:00 2001 From: Lars Jung Date: Wed, 29 Apr 2015 19:47:37 +0200 Subject: [PATCH] Rename mainrow. --- src/_h5ai/client/css/inc/view/mainrow.less | 2 +- src/_h5ai/client/js/inc/ext/info.js | 2 +- src/_h5ai/client/js/inc/ext/tree.js | 2 +- src/_h5ai/client/js/inc/view/mainrow.js | 2 +- test/tests/integration/view.js | 8 ++++---- test/tests/unit/view/content.js | 6 +++--- test/tests/unit/view/mainrow.js | 8 ++++---- test/tests/unit/view/sidebar.js | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/_h5ai/client/css/inc/view/mainrow.less b/src/_h5ai/client/css/inc/view/mainrow.less index 6d57f804..454b1c8e 100644 --- a/src/_h5ai/client/css/inc/view/mainrow.less +++ b/src/_h5ai/client/css/inc/view/mainrow.less @@ -1,4 +1,4 @@ -#main-row { +#mainrow { .flex-row; flex: 1 1 auto; order: 50; diff --git a/src/_h5ai/client/js/inc/ext/info.js b/src/_h5ai/client/js/inc/ext/info.js index f64f08b7..c79d4cbd 100644 --- a/src/_h5ai/client/js/inc/ext/info.js +++ b/src/_h5ai/client/js/inc/ext/info.js @@ -124,7 +124,7 @@ modulejs.define('ext/info', ['_', '$', 'modernizr', 'core/event', 'core/format', return; } - var $info = $(template).appendTo('#main-row'); + var $info = $(template).appendTo('#mainrow'); $img = $info.find('.icon img'); $label = $info.find('.label'); $time = $info.find('.time'); diff --git a/src/_h5ai/client/js/inc/ext/tree.js b/src/_h5ai/client/js/inc/ext/tree.js index 4d60880a..918cc008 100644 --- a/src/_h5ai/client/js/inc/ext/tree.js +++ b/src/_h5ai/client/js/inc/ext/tree.js @@ -189,7 +189,7 @@ modulejs.define('ext/tree', ['_', '$', 'core/event', 'core/location', 'core/reso } $('
') - .appendTo('#main-row') + .appendTo('#mainrow') .on('click', '.indicator', createOnIndicatorClick()); $(settingsTemplate) diff --git a/src/_h5ai/client/js/inc/view/mainrow.js b/src/_h5ai/client/js/inc/view/mainrow.js index 07e818b9..84a1c58f 100644 --- a/src/_h5ai/client/js/inc/view/mainrow.js +++ b/src/_h5ai/client/js/inc/view/mainrow.js @@ -1,6 +1,6 @@ modulejs.define('view/mainrow', ['$', 'view/root'], function ($, root) { - var template = '
'; + var template = '
'; var $el = $(template).appendTo(root.$el); return { diff --git a/test/tests/integration/view.js b/test/tests/integration/view.js index d8d31883..8855f0c7 100644 --- a/test/tests/integration/view.js +++ b/test/tests/integration/view.js @@ -59,16 +59,16 @@ describe('view', function () { assert.lengthOf($('#fallback-hints'), 0); }); - it('adds HTML #main-row to #root', function () { + it('adds HTML #mainrow to #root', function () { modulejs.require('view/viewmode'); - assert.lengthOf($('#root > #main-row'), 1); + assert.lengthOf($('#root > #mainrow'), 1); }); - it('adds HTML #content to #main-row', function () { + it('adds HTML #content to #mainrow', function () { modulejs.require('view/viewmode'); - assert.lengthOf($('#main-row > #content'), 1); + assert.lengthOf($('#mainrow > #content'), 1); }); it('adds HTML #view to #content', function () { diff --git a/test/tests/unit/view/content.js b/test/tests/unit/view/content.js index deb51239..43cc58b4 100644 --- a/test/tests/unit/view/content.js +++ b/test/tests/unit/view/content.js @@ -50,7 +50,7 @@ describe('module \'' + ID + '\'', function () { beforeEach(function () { util.restoreHtml(); - this.xMainrow.$el = $('
').appendTo('body'); + this.xMainrow.$el = $('
').appendTo('body'); }); describe('definition', function () { @@ -95,10 +95,10 @@ describe('module \'' + ID + '\'', function () { assert.lengthOfKeys(instance, 3); }); - it('adds HTML #content to #main-row', function () { + it('adds HTML #content to #mainrow', function () { this.applyFn(); - assert.lengthOf($('#main-row > #content'), 1); + assert.lengthOf($('#mainrow > #content'), 1); }); it('adds HTML #view to #content', function () { diff --git a/test/tests/unit/view/mainrow.js b/test/tests/unit/view/mainrow.js index d3997d5b..24fc9fa6 100644 --- a/test/tests/unit/view/mainrow.js +++ b/test/tests/unit/view/mainrow.js @@ -70,22 +70,22 @@ describe('module \'' + ID + '\'', function () { assert.lengthOfKeys(instance, 1); }); - it('adds HTML #main-row to #root', function () { + it('adds HTML #mainrow to #root', function () { this.applyFn(); - assert.lengthOf($('#root > #main-row'), 1); + assert.lengthOf($('#root > #mainrow'), 1); }); }); describe('.$el', function () { - it('is $(\'#main-row\')', function () { + it('is $(\'#mainrow\')', function () { var instance = this.applyFn(); assert.isObject(instance.$el); assert.lengthOf(instance.$el, 1); assert.isString(instance.$el.jquery); - assert.strictEqual(instance.$el.attr('id'), 'main-row'); + assert.strictEqual(instance.$el.attr('id'), 'mainrow'); }); }); }); diff --git a/test/tests/unit/view/sidebar.js b/test/tests/unit/view/sidebar.js index f0996220..62c21007 100644 --- a/test/tests/unit/view/sidebar.js +++ b/test/tests/unit/view/sidebar.js @@ -40,7 +40,7 @@ describe('module \'' + ID + '\'', function () { beforeEach(function () { util.restoreHtml(); - this.xMainrow.$el = $('
').appendTo('body'); + this.xMainrow.$el = $('
').appendTo('body'); this.xTopbar.$toolbar = $('
').appendTo('body'); });