diff options
| author | Jules Laplace <jules@okfoc.us> | 2014-09-29 16:47:34 -0400 |
|---|---|---|
| committer | Jules Laplace <jules@okfoc.us> | 2014-09-29 16:47:34 -0400 |
| commit | f80ca0ef62785cf72176598b695a1a291dd38e91 (patch) | |
| tree | d3ea5651d9c02fd7b1b6c1e3b72392839dfa1974 | |
| parent | adba61c0fa7231372864e742b9775ba0531ad046 (diff) | |
fix error in color picker
| -rw-r--r-- | public/assets/javascripts/ui/editor/LightControl.js | 6 | ||||
| -rw-r--r-- | public/assets/javascripts/ui/site/LayoutsModal.js | 2 | ||||
| -rw-r--r-- | server/lib/api/rooms.js | 5 | ||||
| -rw-r--r-- | views/projects/layouts-modal.ejs | 5 |
4 files changed, 5 insertions, 13 deletions
diff --git a/public/assets/javascripts/ui/editor/LightControl.js b/public/assets/javascripts/ui/editor/LightControl.js index d975180..96f6942 100644 --- a/public/assets/javascripts/ui/editor/LightControl.js +++ b/public/assets/javascripts/ui/editor/LightControl.js @@ -247,11 +247,11 @@ var LabColorPicker = function (parent, w, h) { var var_G = ( RGB[1] / 255 ) // G from 0 to 255 var var_B = ( RGB[2] / 255 ) // B from 0 to 255 - if ( var_R > 0.04045 ) var_R = ( ( var_R + 0.055 ) / 1.055 ) ^ 2.4 + if ( var_R > 0.04045 ) var_R = Math.pow( ( var_R + 0.055 ) / 1.055, 2.4) else var_R = var_R / 12.92 - if ( var_G > 0.04045 ) var_G = ( ( var_G + 0.055 ) / 1.055 ) ^ 2.4 + if ( var_G > 0.04045 ) var_G = Math.pow( ( var_G + 0.055 ) / 1.055, 2.4) else var_G = var_G / 12.92 - if ( var_B > 0.04045 ) var_B = ( ( var_B + 0.055 ) / 1.055 ) ^ 2.4 + if ( var_B > 0.04045 ) var_B = Math.pow( ( var_B + 0.055 ) / 1.055, 2.4) else var_B = var_B / 12.92 var_R = var_R * 100 diff --git a/public/assets/javascripts/ui/site/LayoutsModal.js b/public/assets/javascripts/ui/site/LayoutsModal.js index f109ec3..bfc3dec 100644 --- a/public/assets/javascripts/ui/site/LayoutsModal.js +++ b/public/assets/javascripts/ui/site/LayoutsModal.js @@ -57,7 +57,7 @@ var ProjectsModal = ModalView.extend(LayoutsIndex.prototype).extend({ this.$(".templates .active").removeClass("active") var $layout = $(e.currentTarget) $layout.addClass("active") - + // actually do window.location.pathname = "/project/" + $layout.data("slug") + "/edit" }, diff --git a/server/lib/api/rooms.js b/server/lib/api/rooms.js index f0e991d..c044309 100644 --- a/server/lib/api/rooms.js +++ b/server/lib/api/rooms.js @@ -61,12 +61,7 @@ var rooms = module.exports = { }) }) - // Walls.deserialize(doc.walls) -// data.media && Scenery.deserialize(data.media) - res.json(doc) - return - }) } } diff --git a/views/projects/layouts-modal.ejs b/views/projects/layouts-modal.ejs index 97f1e61..34dc9af 100644 --- a/views/projects/layouts-modal.ejs +++ b/views/projects/layouts-modal.ejs @@ -33,14 +33,11 @@ <span class="close">X</span> <div class="box"> + <h1>Choose Room Template</h1> <div class="templates"> - <h1>Choose Room Template</h1> </div> <div class="no-templates"> There are no room layouts available. Please <a href="/layout/new">create a new one.</a> </div> - <form> - <input class="button_text" type="submit" value="Create Project"> - </form> </div> </div> |