changeset 115:546381cf83c2

auto sounds better than full.
author Edho Arief <edho@myconan.net>
date Mon, 12 Nov 2012 13:35:11 +0700
parents b72f99d7b8cf
children 9ac24e112ea7
files app/assets/javascripts/init.tabs.js app/views/pastes/show.html.erb
diffstat 2 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/app/assets/javascripts/init.tabs.js	Mon Nov 12 13:31:18 2012 +0700
+++ b/app/assets/javascripts/init.tabs.js	Mon Nov 12 13:35:11 2012 +0700
@@ -12,7 +12,7 @@
         mode = paste.data('mode'),
         width = paste.data('width'),
         qstring = '?' + mode + '.' + width;
-      if ((mode == 'plain') && (width == 'full')) {
+      if ((mode == 'plain') && (width == 'auto')) {
         qstring = '?';
       }
       history.replaceState(null, '', qstring);
@@ -21,8 +21,8 @@
     paste_resize = function(size) {
       var paste = $('#paste'),
         title = $('#tab-resize a.btn');
-      title.html(title.html().replace(/(full|\d+px)/, size));
-      if (size == 'full') {
+      title.html(title.html().replace(/(auto|\d+px)/, size));
+      if (size == 'auto') {
         paste.css('width', '');
         paste.data('width', size);
       } else {
--- a/app/views/pastes/show.html.erb	Mon Nov 12 13:31:18 2012 +0700
+++ b/app/views/pastes/show.html.erb	Mon Nov 12 13:35:11 2012 +0700
@@ -12,11 +12,11 @@
     <li class="pull-right">
       <div class="btn-group" id="tab-resize">
         <a class="btn btn-inverse dropdown-toggle" data-toggle="dropdown" href="#">
-          Width: full
+          Width: auto
           <span class="caret"></span>
         </a>
         <ul class="dropdown-menu">
-          <li><a href="#" data-size="full">full</a></li>
+          <li><a href="#" data-size="auto">auto</a></li>
           <li><a href="#" data-size="560px">560px</a></li>
           <li><a href="#" data-size="760px">760px</a></li>
           <li><a href="#" data-size="960px">960px</a></li>
@@ -24,7 +24,7 @@
       </div>
     </li>
   </ul>
-  <div id="paste" data-mode="plain" data-width="full" class="tab-content">
+  <div id="paste" data-mode="plain" data-width="auto" class="tab-content">
     <div class="tab-pane active" id="plain">
       <pre><%= @paste.paste %></pre>
     </div>