Permalink
Browse files

Merge pull request #43 from jacobmesu/master

Fix for getting visible always returning true
  • Loading branch information...
koenbok committed Oct 1, 2013
2 parents 0cbe0a6 + 36cdb12 commit d21e7d0a4dd16b2c3ecf488ed3b70e5fc6b21b2e
Showing with 5,249 additions and 51 deletions.
  1. +57 −48 build/framer.js
  2. +1 −1 src/views/view.coffee
  3. +5,184 −0 template/framer.js
  4. +7 −2 test/tests/view.coffee
@@ -1,7 +1,7 @@
// Framer 2.0-25-ge4ed1d8 (c) 2013 Koen Bok
// Framer (c) 2013 Koen Bok
// https://github.com/koenbok/Framer
window.FramerVersion = "2.0-25-ge4ed1d8";
window.FramerVersion = "";
(function(){var require = function (file, cwd) {
@@ -2680,7 +2680,8 @@ require.define("/src/views/view.coffee",function(require,module,exports,__dirnam
View.define("visible", {
get: function() {
return this._visible || true;
var _ref;
return (_ref = this._visible) != null ? _ref : true;
},
set: function(value) {
this._visible = value;
@@ -2971,6 +2972,8 @@ require.define("/node_modules/check-types/src/check-types.js",function(require,m
isLength: isLength,
verifyArray: verifyArray,
isArray: isArray,
verifyDate: verifyDate,
isDate: isDate,
verifyFunction: verifyFunction,
isFunction: isFunction,
verifyUnemptyString: verifyUnemptyString,
@@ -3006,8 +3009,12 @@ require.define("/node_modules/check-types/src/check-types.js",function(require,m
* to set on the thrown Error.
*/
function verifyQuack (thing, duck, message) {
if (quacksLike(thing, duck) === false) {
throw new Error(message || 'Invalid type');
verify(quacksLike, [ thing, duck ], message, 'Invalid type');
}
function verify (fn, args, message, defaultMessage) {
if (fn.apply(null, args) === false) {
throw new Error(message || defaultMessage);
}
}
@@ -3059,9 +3066,7 @@ require.define("/node_modules/check-types/src/check-types.js",function(require,m
* to set on the thrown Error.
*/
function verifyInstance (thing, prototype, message) {
if (isInstance(thing, prototype) === false) {
throw new Error(message || 'Invalid type');
}
verify(isInstance, [ thing, prototype ], message, 'Invalid type');
}
/**
@@ -3097,9 +3102,7 @@ require.define("/node_modules/check-types/src/check-types.js",function(require,m
* to set on the thrown Error.
*/
function verifyEmptyObject (thing, message) {
if (isEmptyObject(thing) === false) {
throw new Error(message || 'Invalid empty object');
}
verify(isEmptyObject, [ thing ], message, 'Invalid object');
}
/**
@@ -3129,28 +3132,26 @@ require.define("/node_modules/check-types/src/check-types.js",function(require,m
* Public function `verifyObject`.
*
* Throws an exception unless something is a non-null,
* non-array object.
* non-array, non-date object.
*
* @param thing The thing to test.
* @param [message] {string} An optional error message
* to set on the thrown Error.
*/
function verifyObject (thing, message) {
if (isObject(thing) === false) {
throw new Error(message || 'Invalid object');
}
verify(isObject, [ thing ], message, 'Invalid object');
}
/**
* Public function `isObject`.
*
* Returns `true` if something is a non-null, non-array
* object, `false` otherwise.
* Returns `true` if something is a non-null, non-array,
* non-date object, `false` otherwise.
*
* @param thing The thing to test.
*/
function isObject (thing) {
return typeof thing === 'object' && thing !== null && isArray(thing) === false;
return typeof thing === 'object' && thing !== null && isArray(thing) === false && isDate(thing) === false;
}
/**
@@ -3164,9 +3165,7 @@ require.define("/node_modules/check-types/src/check-types.js",function(require,m
* to set on the thrown Error.
*/
function verifyLength (thing, length, message) {
if (isLength(thing, length) === false) {
throw new Error(message || 'Invalid length');
}
verify(isLength, [ thing, length ], message, 'Invalid length');
}
/**
@@ -3192,9 +3191,7 @@ require.define("/node_modules/check-types/src/check-types.js",function(require,m
* to set on the thrown Error.
*/
function verifyArray (thing, message) {
if (isArray(thing) === false) {
throw new Error(message || 'Invalid array');
}
verify(isArray, [ thing ], message, 'Invalid array');
}
/**
@@ -3205,9 +3202,37 @@ require.define("/node_modules/check-types/src/check-types.js",function(require,m
* @param thing The thing to test.
*/
function isArray (thing) {
if (Array.isArray) {
return Array.isArray(thing);
}
return Object.prototype.toString.call(thing) === '[object Array]';
}
/**
* Public function `verifyDate`.
*
* Throws an exception unless something is a date.
*
* @param thing The thing to test.
* @param [message] {string} An optional error message
* to set on the thrown Error.
*/
function verifyDate (thing, message) {
verify(isDate, [ thing ], message, 'Invalid date');
}
/**
* Public function `isDate`.
*
* Returns `true` something is a date, `false` otherwise.
*
* @param thing The thing to test.
*/
function isDate (thing) {
return Object.prototype.toString.call(thing) === '[object Date]';
}
/**
* Public function `verifyFunction`.
*
@@ -3218,9 +3243,7 @@ require.define("/node_modules/check-types/src/check-types.js",function(require,m
* to set on the thrown Error.
*/
function verifyFunction (thing, message) {
if (isFunction(thing) === false) {
throw new Error(message || 'Invalid function');
}
verify(isFunction, [ thing ], message, 'Invalid function');
}
/**
@@ -3244,9 +3267,7 @@ require.define("/node_modules/check-types/src/check-types.js",function(require,m
* to set on the thrown Error.
*/
function verifyUnemptyString (thing, message) {
if (isUnemptyString(thing) === false) {
throw new Error(message || 'Invalid string');
}
verify(isUnemptyString, [ thing ], message, 'Invalid string');
}
/**
@@ -3271,9 +3292,7 @@ require.define("/node_modules/check-types/src/check-types.js",function(require,m
* to set on the thrown Error.
*/
function verifyString (thing, message) {
if (isString(thing) === false) {
throw new Error(message || 'Invalid string');
}
verify(isString, [ thing ], message, 'Invalid string');
}
/**
@@ -3297,9 +3316,7 @@ require.define("/node_modules/check-types/src/check-types.js",function(require,m
* to set on the thrown Error.
*/
function verifyOddNumber (thing, message) {
if (isOddNumber(thing) === false) {
throw new Error(message || 'Invalid number');
}
verify(isOddNumber, [ thing ], message, 'Invalid number');
}
/**
@@ -3324,9 +3341,7 @@ require.define("/node_modules/check-types/src/check-types.js",function(require,m
* to set on the thrown Error.
*/
function verifyEvenNumber (thing, message) {
if (isEvenNumber(thing) === false) {
throw new Error(message || 'Invalid number');
}
verify(isEvenNumber, [ thing ], message, 'Invalid number');
}
/**
@@ -3351,9 +3366,7 @@ require.define("/node_modules/check-types/src/check-types.js",function(require,m
* to set on the thrown Error.
*/
function verifyPositiveNumber (thing, message) {
if (isPositiveNumber(thing) === false) {
throw new Error(message || 'Invalid number');
}
verify(isPositiveNumber, [ thing ], message, 'Invalid number');
}
/**
@@ -3378,9 +3391,7 @@ require.define("/node_modules/check-types/src/check-types.js",function(require,m
* to set on the thrown Error.
*/
function verifyNegativeNumber (thing, message) {
if (isNegativeNumber(thing) === false) {
throw new Error(message || 'Invalid number');
}
verify(isNegativeNumber, [ thing ], message, 'Invalid number');
}
/**
@@ -3405,9 +3416,7 @@ require.define("/node_modules/check-types/src/check-types.js",function(require,m
* to set on the thrown Error.
*/
function verifyNumber (thing, message) {
if (isNumber(thing) === false) {
throw new Error(message || 'Invalid number');
}
verify(isNumber, [ thing ], message, 'Invalid number');
}
/**
@@ -275,7 +275,7 @@ class View extends Frame
@define "visible",
get: ->
@_visible or true
@_visible ? true
set: (value) ->
@_visible = value
@style.display = "block" if value is true
Oops, something went wrong.

0 comments on commit d21e7d0

Please sign in to comment.