aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton McConville2012-02-10 14:31:33 (EST)
committersfranklin2012-02-10 17:16:30 (EST)
commit46dc534005e233bd0c79356cc0aa5a56682e9064 (patch)
treeb001a0529e56d5c714adb56e064225513d94773f
parent6e7312549fa0ccbe41ae31cadbbd9e1415c84450 (diff)
downloadorg.eclipse.orion.client-46dc534005e233bd0c79356cc0aa5a56682e9064.zip
org.eclipse.orion.client-46dc534005e233bd0c79356cc0aa5a56682e9064.tar.gz
org.eclipse.orion.client-46dc534005e233bd0c79356cc0aa5a56682e9064.tar.bz2
Addresses the following:
371253 - Carousel scrolling 371149 - Plugin Names 349101 - Copy location 371151 - How to see properties
-rw-r--r--bundles/org.eclipse.orion.client.core/web/orion/widgets/PluginList.js4
-rw-r--r--bundles/org.eclipse.orion.client.core/web/orion/widgets/ServiceCarousel.js43
-rw-r--r--bundles/org.eclipse.orion.client.core/web/settings/settings.css3
-rw-r--r--bundles/org.eclipse.orion.client.core/web/settings/settings.js4
4 files changed, 31 insertions, 23 deletions
diff --git a/bundles/org.eclipse.orion.client.core/web/orion/widgets/PluginList.js b/bundles/org.eclipse.orion.client.core/web/orion/widgets/PluginList.js
index 107c16e..86a8d01 100644
--- a/bundles/org.eclipse.orion.client.core/web/orion/widgets/PluginList.js
+++ b/bundles/org.eclipse.orion.client.core/web/orion/widgets/PluginList.js
@@ -21,7 +21,7 @@ define(['require', 'dojo', 'dijit', 'orion/util', 'orion/commands', 'dijit/Toolt
'</div>' +
'<div class="displaytable">' +
'<div class="plugin-settings">' +
- '<list data-dojo-attach-point="pluginSettingsList"></list>' +
+ '<list style="overflow:hidden;" data-dojo-attach-point="pluginSettingsList"></list>' +
'</div>' +
'</div>' +
'</div>',
@@ -50,6 +50,8 @@ define(['require', 'dojo', 'dijit', 'orion/util', 'orion/commands', 'dijit/Toolt
last = last.split( ".html" )[0];
last = last.replace( /([a-z])([A-Z])/, "$1 $2");
last = wordToUpper( last );
+ last = last.replace( 'plugin', '' );
+ last = last.replace( 'Plugin', '' );
return last;
},
diff --git a/bundles/org.eclipse.orion.client.core/web/orion/widgets/ServiceCarousel.js b/bundles/org.eclipse.orion.client.core/web/orion/widgets/ServiceCarousel.js
index 5d9e08d..d834c05 100644
--- a/bundles/org.eclipse.orion.client.core/web/orion/widgets/ServiceCarousel.js
+++ b/bundles/org.eclipse.orion.client.core/web/orion/widgets/ServiceCarousel.js
@@ -39,27 +39,15 @@ define(['require', 'dojo', 'dijit', 'orion/util', 'dijit/TooltipDialog', 'dojo/f
this.inherited(arguments);
},
- setRailsWidth: function(){
- var railsBox = dojo.marginBox( this.rails );
-
- var gaps = 170; // TODO: Write the marginSize calls to build this up
-
- var listwidth = railsBox.w - gaps;
-
- dojo.style( this.listContainer, "width", listwidth + 'px' );
- },
-
postCreate: function(){
var railsBox = dojo.marginBox( this.domNode.parentNode );
- this.setRailsWidth();
this.addData( this.serviceData );
this.serviceLabel.innerHTML = "Services [" + this.serviceData.length +"]";
dojo.style( this.domNode, "width", railsBox.w - 63 + 'px' );
- this.box = dojo.marginBox( this.rails );
-
+ this.box = dojo.marginBox( this.rails );
dojo.removeClass( this.rails, "serviceRailsVisible" );
- dojo.addClass( this.rails, "serviceRailsHidden" );
+ dojo.addClass( this.rails, "serviceRailsHidden" );
},
showServices: function(){
@@ -92,8 +80,18 @@ define(['require', 'dojo', 'dijit', 'orion/util', 'dijit/TooltipDialog', 'dojo/f
showButtons: function(){
- dojo.style( this.leftbutton, "visibility", "visible" );
- dojo.style( this.rightbutton, "visibility", "visible" );
+
+ if( this.serviceData.length > 1 && this.pointer > 0 ){
+ dojo.style( this.leftbutton, "visibility", "visible" );
+ }else{
+ dojo.style( this.leftbutton, "visibility", "hidden" );
+ }
+
+ if( this.serviceData.length > 1 && this.pointer < this.serviceData.length -1 ){
+ dojo.style( this.rightbutton, "visibility", "visible" );
+ }else{
+ dojo.style( this.rightbutton, "visibility", "hidden" );
+ }
var sze = dojo.marginBox( this.rails );
@@ -111,12 +109,12 @@ define(['require', 'dojo', 'dijit', 'orion/util', 'dijit/TooltipDialog', 'dojo/f
},
slideRight: function(){
-
- this.pointer = this.pointer+1;
-
+
this.box = dojo.marginBox( this.rails );
- if( this.pointer < this.serviceData.length ){
+ if( this.pointer < this.serviceData.length -1 ){
+
+ this.pointer = this.pointer+1;
for( var count=0; count < this.pointer; count++ ){
dojo.style( this.listContainer.childNodes[0].childNodes[count], "display", "none" );
@@ -124,6 +122,9 @@ define(['require', 'dojo', 'dijit', 'orion/util', 'dijit/TooltipDialog', 'dojo/f
dojo.marginBox( this.rails, this.box );
}
+
+ this.showButtons();
+
},
slideLeft: function(){
@@ -135,6 +136,8 @@ define(['require', 'dojo', 'dijit', 'orion/util', 'dijit/TooltipDialog', 'dojo/f
dojo.style( this.listContainer.childNodes[0].childNodes[this.pointer], "display", "" );
}
+ this.showButtons();
+
dojo.marginBox( this.rails, this.box );
},
diff --git a/bundles/org.eclipse.orion.client.core/web/settings/settings.css b/bundles/org.eclipse.orion.client.core/web/settings/settings.css
index 03f8431..06c1a84 100644
--- a/bundles/org.eclipse.orion.client.core/web/settings/settings.css
+++ b/bundles/org.eclipse.orion.client.core/web/settings/settings.css
@@ -483,6 +483,7 @@ list>*,grid>* {
overflow:hidden;
-webkit-user-select: none;
transition:height 1s;
+ width:700px;
-moz-transition:height 1s; /* Firefox 4 */
-webkit-transition:height 1s; /* Safari and Chrome */
-o-transition:height 1s;
@@ -499,6 +500,7 @@ list>*,grid>* {
visibility:hidden;
height:0px;
transition:height 1s;
+ width:700px;
-moz-transition:height 1s; /* Firefox 4 */
-webkit-transition:height 1s; /* Safari and Chrome */
-o-transition:height 1s;
@@ -561,6 +563,7 @@ list>*,grid>* {
overflow:hidden;
padding-left:0px;
margin-left:0px;
+ width:600px;
}
.listEntry{
diff --git a/bundles/org.eclipse.orion.client.core/web/settings/settings.js b/bundles/org.eclipse.orion.client.core/web/settings/settings.js
index bee5466..0fb8936 100644
--- a/bundles/org.eclipse.orion.client.core/web/settings/settings.js
+++ b/bundles/org.eclipse.orion.client.core/web/settings/settings.js
@@ -338,8 +338,8 @@ function drawUserInterface( settings ) {
so tailoring it for the preference apps */
var mainNode = dojo.byId( "mainNode" );
- dojo.style( mainNode, "max-width", "700px" );
- dojo.style( mainNode, "min-width", "500px" );
+ dojo.style( mainNode, "maxWidth", "700px" );
+ dojo.style( mainNode, "minWidth", "500px" );
}